Name a few more widgets. Minor cleanup.

8 files changed, 29 insertions, 25 deletions

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index e50824c7b..fbbb4f869 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -168,9 +168,14 @@ void Dialog::read_geometry()
 
 #if WITH_GTKMM_3_22
     auto const display = Gdk::Display::get_default();
-    auto const monitor = display->get_primary_monitor();
+    auto monitor = display->get_primary_monitor();
+
+    // If user hasn't configured a primary monitor, nullptr is returned so try first monitor.
+    if (!monitor) {
+        std::cerr << "Dialog::read_geometry: no primary monitor configured!" << std::endl;
+        monitor = display->get_monitor(0);
+    }
 
-    // If user hasn't configured a primary monitor, nullptr is returned.
     Gdk::Rectangle screen_geometry;
     if (monitor) {
         monitor->get_geometry(screen_geometry);
@@ -179,7 +184,7 @@ void Dialog::read_geometry()
     auto const screen_height = screen_geometry.get_height();
 #else
     auto const screen_width  = gdk_screen_width();
-    auto const screen_height = gdk_screen_width();
+    auto const screen_height = gdk_screen_height();
 #endif
 
     // If there are stored values for where the dialog should be
diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp
index f08089774..074a6a884 100644
--- a/src/ui/dialog/memory.cpp
+++ b/src/ui/dialog/memory.cpp
@@ -210,7 +210,7 @@ Memory::Memory()
     : UI::Widget::Panel ("", "/dialogs/memory", SP_VERB_HELP_MEMORY, _("Recalculate")),
       _private(*(new Memory::Private())) 
 {
-    _getContents()->add(_private.view);
+    _getContents()->pack_start(_private.view);
 
     _private.update();
 
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index d60150767..cda41bdb7 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -55,6 +55,8 @@ ColorNotebook::ColorNotebook(SelectedColor &color)
     : Gtk::Grid()
     , _selected_color(color)
 {
+    set_name("ColorNotebook");
+
     Page *page;
 
     page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_RGB), true);
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index 6bbb8e21d..ffdf173ba 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -31,6 +31,8 @@ ColorWheelSelector::ColorWheelSelector(SelectedColor &color)
     , _wheel(0)
     , _slider(0)
 {
+    set_name("ColorWheelSelector");
+
     _initUI();
     _color_changed_connection = color.signal_changed.connect(sigc::mem_fun(this, &ColorWheelSelector::_colorChanged));
     _color_dragged_connection = color.signal_dragged.connect(sigc::mem_fun(this, &ColorWheelSelector::_colorChanged));
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 4a06163e1..29f22977a 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -29,8 +29,7 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l
     _x(0),
     _y(0),
     _grab_focus_on_realize(false),
-    _gdl_dock_item(0),
-    _dock_item_action_area(0)
+    _gdl_dock_item(0)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     GdlDockItemBehavior gdl_dock_behavior =
diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h
index b5f6c13af..31cdcf080 100644
--- a/src/ui/widget/dock-item.h
+++ b/src/ui/widget/dock-item.h
@@ -108,11 +108,10 @@ private:
     Glib::RefPtr<Gdk::Pixbuf> _icon_pixbuf;
 
     /** Interface widgets, will be packed like 
-     * gdl_dock_item -> _frame -> _dock_item_box -> (_dock_item_action_area) 
+     * gdl_dock_item -> _frame -> _dock_item_box
      */
     Gtk::Frame _frame;
     Gtk::VBox _dock_item_box;
-    Gtk::HButtonBox *_dock_item_action_area;
 
     /** Internal signal handlers */
     void _onHide();
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index 20ec707d8..9c1f0f783 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -56,7 +56,8 @@ Dock::Dock(Gtk::Orientation orientation)
 #endif
       _scrolled_window (Gtk::manage(new Gtk::ScrolledWindow))
 {
-    _scrolled_window->set_name("Dock");
+    gtk_widget_set_name(_gdl_dock, "GdlDock");
+
 #if WITH_GDL_3_6
     gtk_orientable_set_orientation(GTK_ORIENTABLE(_gdl_dock_bar),
                                    static_cast<GtkOrientation>(orientation));
@@ -65,25 +66,22 @@ Dock::Dock(Gtk::Orientation orientation)
                                  static_cast<GtkOrientation>(orientation));
 #endif
 
-    switch(orientation) {
-        case Gtk::ORIENTATION_VERTICAL:
-            _dock_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
-            break;
-        case Gtk::ORIENTATION_HORIZONTAL:
-            _dock_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
-    }
-    
-    _paned = Gtk::manage(new Gtk::Paned(orientation));
+    _filler.set_name("DockBoxFiller");
 
-    _scrolled_window->add(*_dock_box);
-    _scrolled_window->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-
-    _paned->pack1(*Glib::wrap(GTK_WIDGET(_gdl_dock)), false, false);
-    _paned->pack2(_filler, true, false);
+    _paned = Gtk::manage(new Gtk::Paned(orientation));
+    _paned->set_name("DockBoxPane");
+    _paned->pack1(*Glib::wrap(GTK_WIDGET(_gdl_dock)), false,  false);
+    _paned->pack2(_filler,                            true,   false);
+    //                                                resize, shrink
 
+    _dock_box = Gtk::manage(new Gtk::Box(orientation));
+    _dock_box->set_name("DockBox");
     _dock_box->pack_start(*_paned, Gtk::PACK_EXPAND_WIDGET);
     _dock_box->pack_end(*Gtk::manage(Glib::wrap(GTK_WIDGET(_gdl_dock_bar))), Gtk::PACK_SHRINK);
 
+    _scrolled_window->set_name("DockScrolledWindow");
+    _scrolled_window->add(*_dock_box);
+    _scrolled_window->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
     _scrolled_window->set_size_request(0);
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -215,7 +213,6 @@ void Dock::toggleDockable(int width, int height)
         parent_paned->set_position(prev_horizontal_position);
         _paned->set_position(prev_vertical_position);
     }
-
 }
 
 void Dock::scrollToItem(DockItem& item)
diff --git a/src/ui/widget/dock.h b/src/ui/widget/dock.h
index 6258a06e3..efdb6fa39 100644
--- a/src/ui/widget/dock.h
+++ b/src/ui/widget/dock.h
@@ -70,7 +70,7 @@ protected:
     Gtk::Paned          *_paned;
     GtkWidget           *_gdl_dock;
     GdlDockBar          *_gdl_dock_bar;
-    Gtk::VBox            _filler;
+    Gtk::Box             _filler;
     Gtk::ScrolledWindow *_scrolled_window;
 
     /** Internal signal handlers */