summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefano Facchini <stefano.facchini@gmail.com>2017-10-21 14:40:14 +0000
committerTavmjong Bah <tavmjong@free.fr>2018-01-16 21:08:40 +0000
commit78625f7d59d5e54e2adbc3372e454c5e74fcbec9 (patch)
treefc8505ec0b93878004e8751ebde101d7f189e65f /src
parentRemove the dialog "showclose" option (diff)
downloadinkscape-78625f7d59d5e54e2adbc3372e454c5e74fcbec9.tar.gz
inkscape-78625f7d59d5e54e2adbc3372e454c5e74fcbec9.zip
panel: Remove the unused "title" label
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/align-and-distribute.cpp2
-rw-r--r--src/ui/dialog/clonetiler.cpp2
-rw-r--r--src/ui/dialog/cssdialog.cpp2
-rw-r--r--src/ui/dialog/document-metadata.cpp2
-rw-r--r--src/ui/dialog/document-properties.cpp2
-rw-r--r--src/ui/dialog/export.cpp2
-rw-r--r--src/ui/dialog/extension-editor.cpp2
-rw-r--r--src/ui/dialog/fill-and-stroke.cpp2
-rw-r--r--src/ui/dialog/filter-editor.cpp2
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp2
-rw-r--r--src/ui/dialog/find.cpp2
-rw-r--r--src/ui/dialog/glyphs.cpp2
-rw-r--r--src/ui/dialog/icon-preview.cpp2
-rw-r--r--src/ui/dialog/input.h2
-rw-r--r--src/ui/dialog/layers.cpp2
-rw-r--r--src/ui/dialog/livepatheffect-editor.cpp2
-rw-r--r--src/ui/dialog/memory.cpp2
-rw-r--r--src/ui/dialog/messages.cpp2
-rw-r--r--src/ui/dialog/object-attributes.cpp2
-rw-r--r--src/ui/dialog/object-properties.cpp2
-rw-r--r--src/ui/dialog/objects.cpp2
-rw-r--r--src/ui/dialog/pixelartdialog.h2
-rw-r--r--src/ui/dialog/print-colors-preview-dialog.cpp2
-rw-r--r--src/ui/dialog/prototype.cpp4
-rw-r--r--src/ui/dialog/spellcheck.cpp2
-rw-r--r--src/ui/dialog/styledialog.cpp2
-rw-r--r--src/ui/dialog/svg-fonts-dialog.cpp2
-rw-r--r--src/ui/dialog/swatches.cpp2
-rw-r--r--src/ui/dialog/symbols.cpp2
-rw-r--r--src/ui/dialog/tags.cpp2
-rw-r--r--src/ui/dialog/text-edit.cpp2
-rw-r--r--src/ui/dialog/tile.cpp2
-rw-r--r--src/ui/dialog/tracedialog.h2
-rw-r--r--src/ui/dialog/transformation.cpp2
-rw-r--r--src/ui/dialog/undo-history.cpp2
-rw-r--r--src/ui/dialog/xml-tree.cpp2
-rw-r--r--src/ui/widget/panel.cpp31
-rw-r--r--src/ui/widget/panel.h13
38 files changed, 38 insertions, 80 deletions
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 52f31e046..4314c9e89 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -910,7 +910,7 @@ static void on_selection_changed(AlignAndDistribute *daad)
AlignAndDistribute::AlignAndDistribute()
- : UI::Widget::Panel ("", "/dialogs/align", SP_VERB_DIALOG_ALIGN_DISTRIBUTE),
+ : UI::Widget::Panel("/dialogs/align", SP_VERB_DIALOG_ALIGN_DISTRIBUTE),
randomize_bbox(),
_alignFrame(_("Align")),
_distributeFrame(_("Distribute")),
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 2abd6af6b..59c9e4cd4 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -68,7 +68,7 @@ static gdouble trace_zoom;
static SPDocument *trace_doc = NULL;
CloneTiler::CloneTiler () :
- UI::Widget::Panel ("", "/dialogs/clonetiler/", SP_VERB_DIALOG_CLONETILER),
+ UI::Widget::Panel("/dialogs/clonetiler/", SP_VERB_DIALOG_CLONETILER),
desktop(NULL),
deskTrack(),
table_row_labels(NULL)
diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index 0443d7c44..37f2b4c30 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -32,7 +32,7 @@ namespace Dialog {
* drawing.
*/
CssDialog::CssDialog():
- UI::Widget::Panel("", "/dialogs/css", SP_VERB_DIALOG_CSS),
+ UI::Widget::Panel("/dialogs/css", SP_VERB_DIALOG_CSS),
_desktop(0)
{
set_size_request(20, 15);
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index 74cf9ef0d..c219603b4 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -60,7 +60,7 @@ DocumentMetadata::getInstance()
DocumentMetadata::DocumentMetadata()
- : UI::Widget::Panel ("", "/dialogs/documentmetadata", SP_VERB_DIALOG_METADATA)
+ : UI::Widget::Panel("/dialogs/documentmetadata", SP_VERB_DIALOG_METADATA)
{
hide();
_getContents()->set_spacing (4);
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 48e0042b4..6b213f99a 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -88,7 +88,7 @@ DocumentProperties& DocumentProperties::getInstance()
}
DocumentProperties::DocumentProperties()
- : UI::Widget::Panel ("", "/dialogs/documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
+ : UI::Widget::Panel("/dialogs/documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
_page_page(Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
_page_guides(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
_page_snap(Gtk::manage(new UI::Widget::NotebookPage(1, 1))),
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 1c6632960..fc985aa44 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -121,7 +121,7 @@ static const char * selection_labels[SELECTION_NUMBER_OF] = {
};
Export::Export (void) :
- UI::Widget::Panel ("", "/dialogs/export/", SP_VERB_DIALOG_EXPORT),
+ UI::Widget::Panel("/dialogs/export/", SP_VERB_DIALOG_EXPORT),
current_key(SELECTION_PAGE),
original_name(),
doc_export_name(),
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index a710a2fb4..14248cc4b 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -41,7 +41,7 @@ namespace Dialog {
* a new extension is selected, the notebooks are changed appropriately.
*/
ExtensionEditor::ExtensionEditor()
- : UI::Widget::Panel ("", "/dialogs/extensioneditor", SP_VERB_DIALOG_EXTENSIONEDITOR)
+ : UI::Widget::Panel("/dialogs/extensioneditor", SP_VERB_DIALOG_EXTENSIONEDITOR)
{
_notebook_info.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
_notebook_help.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index 513cee752..16a9a026b 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -38,7 +38,7 @@ namespace UI {
namespace Dialog {
FillAndStroke::FillAndStroke()
- : UI::Widget::Panel ("", "/dialogs/fillstroke", SP_VERB_DIALOG_FILL_STROKE),
+ : UI::Widget::Panel("/dialogs/fillstroke", SP_VERB_DIALOG_FILL_STROKE),
_page_fill(Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
_page_stroke_paint(Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
_page_stroke_style(Gtk::manage(new UI::Widget::NotebookPage(1, 1, true, true))),
diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp
index 1b532578d..7cec7dc01 100644
--- a/src/ui/dialog/filter-editor.cpp
+++ b/src/ui/dialog/filter-editor.cpp
@@ -69,7 +69,7 @@ namespace Inkscape {
namespace UI {
namespace Dialog {
-FilterEditorDialog::FilterEditorDialog() : UI::Widget::Panel("", "/dialogs/filtereffects", SP_VERB_DIALOG_FILTER_EFFECTS)
+FilterEditorDialog::FilterEditorDialog() : UI::Widget::Panel("/dialogs/filtereffects", SP_VERB_DIALOG_FILTER_EFFECTS)
{
const std::string req_widgets[] = {"FilterEditor", "FilterList", "FilterFERX", "FilterFERY", "FilterFERH", "FilterFERW", "FilterPreview", "FilterPrimitiveDescImage", "FilterPrimitiveList", "FilterPrimitiveDescText", "FilterPrimitiveAdd"};
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index bfebc687d..c72216873 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -2626,7 +2626,7 @@ int FilterEffectsDialog::PrimitiveList::get_input_type_width() const
/*** FilterEffectsDialog ***/
FilterEffectsDialog::FilterEffectsDialog()
- : UI::Widget::Panel("", "/dialogs/filtereffects", SP_VERB_DIALOG_FILTER_EFFECTS),
+ : UI::Widget::Panel("/dialogs/filtereffects", SP_VERB_DIALOG_FILTER_EFFECTS),
_add_primitive_type(FPConverter),
_add_primitive(_("Add Effect:")),
_empty_settings(_("No effect selected"), Gtk::ALIGN_START),
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index b4f7902f5..0f327d6d1 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -60,7 +60,7 @@ namespace UI {
namespace Dialog {
Find::Find()
- : UI::Widget::Panel("", "/dialogs/find", SP_VERB_DIALOG_FIND),
+ : UI::Widget::Panel("/dialogs/find", SP_VERB_DIALOG_FIND),
entry_find(_("F_ind:"), _("Find objects by their content or properties (exact or partial match)")),
entry_replace(_("R_eplace:"), _("Replace match with this value")),
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index a23d4ffee..e5d83dacb 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -318,7 +318,7 @@ GlyphColumns *GlyphsPanel::getColumns()
* Constructor
*/
GlyphsPanel::GlyphsPanel(gchar const *prefsPath) :
- Inkscape::UI::Widget::Panel("", prefsPath, SP_VERB_DIALOG_GLYPHS),
+ Inkscape::UI::Widget::Panel(prefsPath, SP_VERB_DIALOG_GLYPHS),
store(Gtk::ListStore::create(*getColumns())),
iconView(0),
entry(0),
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index f9cd8929a..aeb56e563 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -88,7 +88,7 @@ void IconPreviewPanel::on_button_clicked(int which)
* Constructor
*/
IconPreviewPanel::IconPreviewPanel() :
- UI::Widget::Panel("", "/dialogs/iconpreview", SP_VERB_VIEW_ICON_PREVIEW),
+ UI::Widget::Panel("/dialogs/iconpreview", SP_VERB_VIEW_ICON_PREVIEW),
deskTrack(),
desktop(0),
document(0),
diff --git a/src/ui/dialog/input.h b/src/ui/dialog/input.h
index 40bbbeebf..f61b6972f 100644
--- a/src/ui/dialog/input.h
+++ b/src/ui/dialog/input.h
@@ -25,7 +25,7 @@ class InputDialog : public UI::Widget::Panel
public:
static InputDialog &getInstance();
- InputDialog() : UI::Widget::Panel("", "/dialogs/inputdevices", SP_VERB_DIALOG_INPUT) {}
+ InputDialog() : UI::Widget::Panel("/dialogs/inputdevices", SP_VERB_DIALOG_INPUT) {}
virtual ~InputDialog() {}
};
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 2a59bac00..e16b1a0f5 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -797,7 +797,7 @@ bool LayersPanel::_rowSelectFunction( Glib::RefPtr<Gtk::TreeModel> const & /*mod
* Constructor
*/
LayersPanel::LayersPanel() :
- UI::Widget::Panel("", "/dialogs/layers", SP_VERB_DIALOG_LAYERS),
+ UI::Widget::Panel("/dialogs/layers", SP_VERB_DIALOG_LAYERS),
deskTrack(),
_maxNestDepth(20),
_desktop(0),
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 28a42929b..24591d496 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -81,7 +81,7 @@ static void lpe_style_button(Gtk::Button& btn, char const* iconName)
*/
LivePathEffectEditor::LivePathEffectEditor()
- : UI::Widget::Panel("", "/dialogs/livepatheffect", SP_VERB_DIALOG_LIVE_PATH_EFFECT),
+ : UI::Widget::Panel("/dialogs/livepatheffect", SP_VERB_DIALOG_LIVE_PATH_EFFECT),
deskTrack(),
lpe_list_locked(false),
lpe_changed(true),
diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp
index 228701dab..c9a16225e 100644
--- a/src/ui/dialog/memory.cpp
+++ b/src/ui/dialog/memory.cpp
@@ -208,7 +208,7 @@ void Memory::Private::stop_update_task() {
}
Memory::Memory()
- : UI::Widget::Panel ("", "/dialogs/memory", SP_VERB_HELP_MEMORY),
+ : UI::Widget::Panel("/dialogs/memory", SP_VERB_HELP_MEMORY),
_private(*(new Memory::Private()))
{
_getContents()->pack_start(_private.view);
diff --git a/src/ui/dialog/messages.cpp b/src/ui/dialog/messages.cpp
index 3a8e7338d..e96ac73c3 100644
--- a/src/ui/dialog/messages.cpp
+++ b/src/ui/dialog/messages.cpp
@@ -43,7 +43,7 @@ void Messages::clear()
* Constructor
*/
Messages::Messages()
- : UI::Widget::Panel("", "/dialogs/messages", SP_VERB_DIALOG_DEBUG),
+ : UI::Widget::Panel("/dialogs/messages", SP_VERB_DIALOG_DEBUG),
buttonClear(_("_Clear"), _("Clear log messages")),
checkCapture(_("Capture log messages"), _("Capture log messages"))
{
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index 72520d3d0..0facb9038 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -77,7 +77,7 @@ static const SPAttrDesc image_nohref_desc[] = {
};
ObjectAttributes::ObjectAttributes (void) :
- UI::Widget::Panel ("", "/dialogs/objectattr/", SP_VERB_DIALOG_ATTR),
+ UI::Widget::Panel("/dialogs/objectattr/", SP_VERB_DIALOG_ATTR),
blocked (false),
CurrentItem(NULL),
attrTable(Gtk::manage(new SPAttributeTable())),
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 4c8bd4176..ad80a0171 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -44,7 +44,7 @@ namespace UI {
namespace Dialog {
ObjectProperties::ObjectProperties()
- : UI::Widget::Panel ("", "/dialogs/object/", SP_VERB_DIALOG_ITEM)
+ : UI::Widget::Panel("/dialogs/object/", SP_VERB_DIALOG_ITEM)
, _blocked (false)
, _current_item(NULL)
, _label_id(_("_ID:"), 1)
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 6d2e884b0..e01660ad1 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -1646,7 +1646,7 @@ void ObjectsPanel::_blurChangedIter(const Gtk::TreeIter& iter, double blur)
* Constructor
*/
ObjectsPanel::ObjectsPanel() :
- UI::Widget::Panel("", "/dialogs/objects", SP_VERB_DIALOG_OBJECTS),
+ UI::Widget::Panel("/dialogs/objects", SP_VERB_DIALOG_OBJECTS),
_rootWatcher(0),
_deskTrack(),
_desktop(0),
diff --git a/src/ui/dialog/pixelartdialog.h b/src/ui/dialog/pixelartdialog.h
index 165cb8699..b928b4396 100644
--- a/src/ui/dialog/pixelartdialog.h
+++ b/src/ui/dialog/pixelartdialog.h
@@ -30,7 +30,7 @@ class PixelArtDialog : public UI::Widget::Panel
public:
PixelArtDialog() :
- UI::Widget::Panel("", "/dialogs/pixelart", SP_VERB_SELECTION_PIXEL_ART)
+ UI::Widget::Panel("/dialogs/pixelart", SP_VERB_SELECTION_PIXEL_ART)
{}
diff --git a/src/ui/dialog/print-colors-preview-dialog.cpp b/src/ui/dialog/print-colors-preview-dialog.cpp
index 5e96a8e61..b53591a9a 100644
--- a/src/ui/dialog/print-colors-preview-dialog.cpp
+++ b/src/ui/dialog/print-colors-preview-dialog.cpp
@@ -55,7 +55,7 @@ void PrintColorsPreviewDialog::toggle_black(){
}
PrintColorsPreviewDialog::PrintColorsPreviewDialog()
- : UI::Widget::Panel("", "/dialogs/printcolorspreview", SP_VERB_DIALOG_PRINT_COLORS_PREVIEW)
+ : UI::Widget::Panel("/dialogs/printcolorspreview", SP_VERB_DIALOG_PRINT_COLORS_PREVIEW)
{
Gtk::VBox* vbox = Gtk::manage(new Gtk::VBox());
diff --git a/src/ui/dialog/prototype.cpp b/src/ui/dialog/prototype.cpp
index b7c9f7abf..46bf5cb11 100644
--- a/src/ui/dialog/prototype.cpp
+++ b/src/ui/dialog/prototype.cpp
@@ -25,9 +25,7 @@ namespace Dialog {
// Note that in order for a dialog to be restored, it must be listed in SPDesktop::show_dialogs().
Prototype::Prototype() :
- // UI::Widget::Panel("Prototype Label", "/dialogs/prototype", SP_VERB_DIALOG_PROTOTYPE,
- // "Prototype Apply Label", true),
- UI::Widget::Panel("Prototype Label", "/dialogs/prototype", SP_VERB_DIALOG_PROTOTYPE),
+ UI::Widget::Panel("/dialogs/prototype", SP_VERB_DIALOG_PROTOTYPE),
desktopTracker() //,
// desktopChangedConnection()
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 3318b5e6b..3d91ad559 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -49,7 +49,7 @@ namespace Dialog {
SpellCheck::SpellCheck (void) :
- UI::Widget::Panel ("", "/dialogs/spellcheck/", SP_VERB_DIALOG_SPELLCHECK),
+ UI::Widget::Panel("/dialogs/spellcheck/", SP_VERB_DIALOG_SPELLCHECK),
_text(NULL),
_layout(NULL),
_stops(0),
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 5ca085094..76ab2c7d6 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -236,7 +236,7 @@ Glib::RefPtr<StyleDialog::TreeStore> StyleDialog::TreeStore::create(StyleDialog
* Any addition/deletion of the selectors updates XML style element accordingly.
*/
StyleDialog::StyleDialog() :
- UI::Widget::Panel("", "/dialogs/style", SP_VERB_DIALOG_STYLE),
+ UI::Widget::Panel("/dialogs/style", SP_VERB_DIALOG_STYLE),
_updating(false),
_textNode(NULL),
_desktopTracker()
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index d58e0a064..5d0080443 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -995,7 +995,7 @@ void SvgFontsDialog::add_font(){
}
SvgFontsDialog::SvgFontsDialog()
- : UI::Widget::Panel("", "/dialogs/svgfonts", SP_VERB_DIALOG_SVG_FONTS),
+ : UI::Widget::Panel("/dialogs/svgfonts", SP_VERB_DIALOG_SVG_FONTS),
_add(_("_New"), true)
{
kerning_slider = Gtk::manage(new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL));
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 443993a8c..684074150 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -547,7 +547,7 @@ SwatchesPanel& SwatchesPanel::getInstance()
* Constructor
*/
SwatchesPanel::SwatchesPanel(gchar const* prefsPath) :
- Inkscape::UI::Widget::Panel("", prefsPath, SP_VERB_DIALOG_SWATCHES, true),
+ Inkscape::UI::Widget::Panel(prefsPath, SP_VERB_DIALOG_SWATCHES, true),
_holder(0),
_clear(0),
_remove(0),
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 623c45605..117e3da5d 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -103,7 +103,7 @@ SymbolColumns* SymbolsDialog::getColumns()
* Constructor
*/
SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
- UI::Widget::Panel("", prefsPath, SP_VERB_DIALOG_SYMBOLS),
+ UI::Widget::Panel(prefsPath, SP_VERB_DIALOG_SYMBOLS),
store(Gtk::ListStore::create(*getColumns())),
all_docs_processed(0),
icon_view(0),
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index ebd36da01..3df59bb31 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -902,7 +902,7 @@ void TagsPanel::_setExpanded(const Gtk::TreeModel::iterator& iter, const Gtk::Tr
* Constructor
*/
TagsPanel::TagsPanel() :
- UI::Widget::Panel("", "/dialogs/tags", SP_VERB_DIALOG_TAGS),
+ UI::Widget::Panel("/dialogs/tags", SP_VERB_DIALOG_TAGS),
_rootWatcher(0),
deskTrack(),
_desktop(0),
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 078c7603c..8ada1b3b9 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -56,7 +56,7 @@ namespace UI {
namespace Dialog {
TextEdit::TextEdit()
- : UI::Widget::Panel("", "/dialogs/textandfont", SP_VERB_DIALOG_TEXT),
+ : UI::Widget::Panel("/dialogs/textandfont", SP_VERB_DIALOG_TEXT),
font_label(_("_Font"), true),
text_label(_("_Text"), true),
vari_label(_("_Variants"), true),
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index a3cffb3d4..0f0e3f8b3 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -27,7 +27,7 @@ namespace UI {
namespace Dialog {
ArrangeDialog::ArrangeDialog()
- : UI::Widget::Panel("", "/dialogs/gridtiler", SP_VERB_SELECTION_ARRANGE),
+ : UI::Widget::Panel("/dialogs/gridtiler", SP_VERB_SELECTION_ARRANGE),
_gridArrangeTab(new GridArrangeTab(this)),
_polarArrangeTab(new PolarArrangeTab(this))
{
diff --git a/src/ui/dialog/tracedialog.h b/src/ui/dialog/tracedialog.h
index f4b9f6f10..e6eb4fbde 100644
--- a/src/ui/dialog/tracedialog.h
+++ b/src/ui/dialog/tracedialog.h
@@ -32,7 +32,7 @@ public:
* Constructor
*/
TraceDialog() :
- UI::Widget::Panel("", "/dialogs/trace", SP_VERB_SELECTION_TRACE)
+ UI::Widget::Panel("/dialogs/trace", SP_VERB_SELECTION_TRACE)
{}
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 8713e6ddc..fc9fe271e 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -54,7 +54,7 @@ static void on_selection_modified(Inkscape::Selection *selection, Transformation
########################################################################*/
Transformation::Transformation()
- : UI::Widget::Panel ("", "/dialogs/transformation", SP_VERB_DIALOG_TRANSFORM),
+ : UI::Widget::Panel("/dialogs/transformation", SP_VERB_DIALOG_TRANSFORM),
_page_move (4, 2),
_page_scale (4, 2),
_page_rotate (4, 2),
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index d3bfa75d3..2486e8897 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -94,7 +94,7 @@ UndoHistory& UndoHistory::getInstance()
}
UndoHistory::UndoHistory()
- : UI::Widget::Panel ("", "/dialogs/undo-history", SP_VERB_DIALOG_UNDO_HISTORY),
+ : UI::Widget::Panel("/dialogs/undo-history", SP_VERB_DIALOG_UNDO_HISTORY),
_document_replaced_connection(),
_desktop(getDesktop()),
_document(_desktop ? _desktop->doc() : NULL),
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 3dfd014a1..f90dc6fe1 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -46,7 +46,7 @@ namespace UI {
namespace Dialog {
XmlTree::XmlTree (void) :
- UI::Widget::Panel ("", "/dialogs/xml/", SP_VERB_DIALOG_XML_EDITOR),
+ UI::Widget::Panel("/dialogs/xml/", SP_VERB_DIALOG_XML_EDITOR),
blocked (0),
_message_stack (NULL),
_message_context (NULL),
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 2d0a75d2b..c97543371 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -55,13 +55,12 @@ void Panel::prep() {
eek_preview_set_size_mappings( G_N_ELEMENTS(sizes), sizes );
}
-Panel::Panel(Glib::ustring const &label, gchar const *prefs_path,
+Panel::Panel(gchar const *prefs_path,
int verb_num,
bool menu_desired) :
_prefs_path(prefs_path),
_menu_desired(menu_desired),
_desktop(SP_ACTIVE_DESKTOP),
- _label(label),
_verb_num(verb_num),
_temp_arrow(),
_menu(0),
@@ -256,16 +255,6 @@ void Panel::_init()
(*iter)->hide();
}
- // _close_button.set_label("X");
-
- if (!_label.empty()) {
- _tab_title.set_label(_label);
- _top_bar.pack_start(_tab_title);
- }
-
- // _top_bar.pack_end(_close_button, false, false);
-
-
if ( _menu_desired ) {
_top_bar.pack_end(_menu_popper, false, false);
gint width = 0;
@@ -302,17 +291,6 @@ void Panel::_init()
_bounceCall(PANEL_SETTING_BORDER, panel_border);
}
-void Panel::setLabel(Glib::ustring const &label)
-{
- if (_label.empty() && !label.empty())
- _top_bar.pack_start(_tab_title);
- else if (!_label.empty() && label.empty())
- _top_bar.remove(_tab_title);
-
- _label = label;
- _tab_title.set_label(_label);
-}
-
void Panel::setOrientation(SPAnchorType how)
{
if (_anchor != how) {
@@ -336,8 +314,6 @@ void Panel::setOrientation(SPAnchorType how)
}
// Ensure we are not in "list" mode
_bounceCall(PANEL_SETTING_MODE, 1);
- if (!_label.empty())
- _top_bar.remove(_tab_title);
}
break;
@@ -532,11 +508,6 @@ gchar const *Panel::getPrefsPath() const
return _prefs_path.data();
}
-Glib::ustring const &Panel::getLabel() const
-{
- return _label;
-}
-
int const &Panel::getVerb() const
{
return _verb_num;
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index f90420913..7b4de124b 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -65,23 +65,15 @@ public:
/**
* Construct a Panel.
*
- * @param label label for the panel of a dialog, shown at the top.
* @param prefs_path characteristic path to load/save dialog position.
* @param verb_num the dialog verb.
*/
- Panel(Glib::ustring const &label = "", gchar const *prefs_path = 0,
- int verb_num = 0,
- bool menu_desired = false);
+ Panel(gchar const *prefs_path = 0, int verb_num = 0, bool menu_desired = false);
virtual ~Panel();
gchar const *getPrefsPath() const;
- /**
- * Sets a label for the panel and displays it in the panel at the top (is not the title bar of a floating dialog).
- */
- void setLabel(Glib::ustring const &label);
- Glib::ustring const &getLabel() const;
int const &getVerb() const;
virtual void setOrientation(SPAnchorType how);
@@ -148,16 +140,13 @@ private:
SPDesktop *_desktop;
- Glib::ustring _label;
int _verb_num;
Gtk::HBox _top_bar;
Gtk::VBox _right_bar;
Gtk::VBox _contents;
- Gtk::Label _tab_title;
Gtk::Image _temp_arrow;
Gtk::EventBox _menu_popper;
- Gtk::Button _close_button;
Gtk::Menu *_menu;
Gtk::ButtonBox *_action_area; //< stores response buttons