panel: Remove the unused "title" label

2 files changed, 2 insertions, 42 deletions

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