[niepce] Fix rating menu. We show a text label. No need to subclass anything.



commit 207e9028ccf9a84c74219926cadb99543485021f
Author: Hubert Figuière <hub figuiere net>
Date:   Tue Jun 18 23:14:59 2013 -0400

    Fix rating menu. We show a text label. No need to subclass anything.

 src/fwk/toolkit/Makefile.am                |    2 -
 src/fwk/toolkit/widgets/ratingaction.cpp   |   39 ----------------------
 src/fwk/toolkit/widgets/ratingaction.hpp   |   48 ----------------------------
 src/fwk/toolkit/widgets/ratingmenuitem.hpp |   48 ----------------------------
 src/niepce/ui/moduleshell.cpp              |   13 +++----
 5 files changed, 6 insertions(+), 144 deletions(-)
---
diff --git a/src/fwk/toolkit/Makefile.am b/src/fwk/toolkit/Makefile.am
index 707d80d..a2f76a1 100644
--- a/src/fwk/toolkit/Makefile.am
+++ b/src/fwk/toolkit/Makefile.am
@@ -29,9 +29,7 @@ libniepceframework_a_SOURCES = configuration.hpp configuration.cpp \
        gdkutils.hpp gdkutils.cpp \
        gtkutils.hpp gtkutils.cpp \
        widgets/addinstreemodel.hpp widgets/addinstreemodel.cpp \
-       widgets/ratingaction.hpp widgets/ratingaction.cpp \
        widgets/ratinglabel.hpp widgets/ratinglabel.cpp \
-       widgets/ratingmenuitem.hpp \
        widgets/toolboxitemwidget.hpp widgets/toolboxitemwidget.cpp \
        widgets/editablehscale.hpp widgets/editablehscale.cpp \
        widgets/dock.cpp widgets/dock.hpp \
diff --git a/src/niepce/ui/moduleshell.cpp b/src/niepce/ui/moduleshell.cpp
index 3906abc..5f3c21b 100644
--- a/src/niepce/ui/moduleshell.cpp
+++ b/src/niepce/ui/moduleshell.cpp
@@ -31,7 +31,6 @@
 #include "engine/db/library.hpp"
 #include "engine/db/libfile.hpp"
 #include "fwk/toolkit/application.hpp"
-#include "fwk/toolkit/widgets/ratingaction.hpp"
 #include "moduleshell.hpp"
 #include "niepcewindow.hpp"
 #include "metadatapanecontroller.hpp"
@@ -99,32 +98,32 @@ Gtk::Widget * ModuleShell::buildWidget(const Glib::RefPtr<Gtk::UIManager> & mana
                               4));
     
     m_actionGroup->add(Gtk::Action::create("SetRating", _("Set _Rating")));
-    m_actionGroup->add(fwk::RatingAction::create("SetRating0", 0),
+    m_actionGroup->add(Gtk::Action::create("SetRating0", _("Unrated")),
                           Gtk::AccelKey("0"), sigc::bind(
                               sigc::mem_fun(*m_selection_controller,
                                             &SelectionController::set_rating),
                               0));
-    m_actionGroup->add(fwk::RatingAction::create("SetRating1", 1),
+    m_actionGroup->add(Gtk::Action::create("SetRating1", _("Rating _1")),
                           Gtk::AccelKey("1"), sigc::bind(
                               sigc::mem_fun(*m_selection_controller,
                                             &SelectionController::set_rating),
                               1));
-    m_actionGroup->add(fwk::RatingAction::create("SetRating2", 2),
+    m_actionGroup->add(Gtk::Action::create("SetRating2", _("Rating _2")),
                           Gtk::AccelKey("2"), sigc::bind(
                               sigc::mem_fun(*m_selection_controller,
                                             &SelectionController::set_rating),
                               2));
-    m_actionGroup->add(fwk::RatingAction::create("SetRating3", 3),
+    m_actionGroup->add(Gtk::Action::create("SetRating3", _("Rating _3")),
                           Gtk::AccelKey("3"), sigc::bind(
                               sigc::mem_fun(*m_selection_controller,
                                             &SelectionController::set_rating),
                               3));
-    m_actionGroup->add(fwk::RatingAction::create("SetRating4", 4),
+    m_actionGroup->add(Gtk::Action::create("SetRating4", _("Rating _4")),
                           Gtk::AccelKey("4"), sigc::bind(
                               sigc::mem_fun(*m_selection_controller,
                                             &SelectionController::set_rating),
                               4));
-    m_actionGroup->add(fwk::RatingAction::create("SetRating5", 5),
+    m_actionGroup->add(Gtk::Action::create("SetRating5", _("Rating _5")),
                        Gtk::AccelKey("5"), sigc::bind(
                            sigc::mem_fun(*m_selection_controller,
                                          &SelectionController::set_rating),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]