[niepce] Remove stock items Remove VBox and HBox
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] Remove stock items Remove VBox and HBox
- Date: Sat, 12 Jul 2014 17:02:22 +0000 (UTC)
commit 920bdf71e4267e1ec3223229514ca72a3a809372
Author: Hubert Figuière <hub figuiere net>
Date: Fri Jul 11 21:17:27 2014 -0400
Remove stock items
Remove VBox and HBox
camerawire/src/cwwindow.cpp | 4 +-
camerawire/src/cwwindow.hpp | 4 +-
data/icons/Makefile.am | 1 -
data/icons/niepce-rotate-left.png | Bin 1487 -> 0 bytes
data/icons/niepce-rotate-right.png | Bin 1510 -> 0 bytes
po/POTFILES.in | 1 -
src/fwk/toolkit/dockable.cpp | 10 ++--
src/fwk/toolkit/dockable.hpp | 4 +-
src/fwk/toolkit/frame.cpp | 5 +-
src/fwk/toolkit/widgets/dock-item.cpp | 1 -
src/fwk/toolkit/widgets/editablehscale.cpp | 6 +-
src/fwk/toolkit/widgets/editablehscale.hpp | 2 +-
src/niepce/Makefile.am | 1 -
src/niepce/modules/darkroom/darkroommodule.cpp | 2 +-
src/niepce/modules/darkroom/darkroommodule.hpp | 2 +-
src/niepce/modules/darkroom/dritemwidget.cpp | 1 +
src/niepce/modules/darkroom/dritemwidget.hpp | 2 +-
src/niepce/modules/darkroom/toolboxcontroller.cpp | 5 +-
src/niepce/stock.cpp | 71 ---------------------
src/niepce/stock.hpp | 45 -------------
src/niepce/ui/dialogs/importdialog.cpp | 3 +-
src/niepce/ui/metadatapanecontroller.cpp | 11 ++--
src/niepce/ui/moduleshell.cpp | 30 ++++-----
src/niepce/ui/moduleshellwidget.cpp | 2 +-
src/niepce/ui/moduleshellwidget.hpp | 2 +-
src/niepce/ui/niepceapplication.cpp | 3 -
src/niepce/ui/niepcewindow.cpp | 51 ++++++++-------
src/niepce/ui/niepcewindow.hpp | 2 +-
src/niepce/ui/workspacecontroller.cpp | 1 +
src/niepce/ui/workspacecontroller.hpp | 2 +-
30 files changed, 77 insertions(+), 197 deletions(-)
---
diff --git a/camerawire/src/cwwindow.cpp b/camerawire/src/cwwindow.cpp
index 73a9458..2f66651 100644
--- a/camerawire/src/cwwindow.cpp
+++ b/camerawire/src/cwwindow.cpp
@@ -35,7 +35,9 @@ namespace cw {
CwWindow::CwWindow()
- : fwk::Frame("cw-window-frame")
+ : fwk::Frame("cw-window-frame")
+ , m_vbox(Gtk::ORIENTATION_VERTICAL)
+ , m_hbox(Gtk::ORIENTATION_HORIZONTAL)
{
}
diff --git a/camerawire/src/cwwindow.hpp b/camerawire/src/cwwindow.hpp
index cc0b0c5..e0dcd36 100644
--- a/camerawire/src/cwwindow.hpp
+++ b/camerawire/src/cwwindow.hpp
@@ -70,8 +70,8 @@ private:
CameraTreeRecord m_camera_tree_record;
Glib::RefPtr<Gtk::ListStore> m_camera_tree_model;
- Gtk::VBox m_vbox;
- Gtk::HBox m_hbox;
+ Gtk::Box m_vbox;
+ Gtk::Box m_hbox;
Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup;
};
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 4c12415..4805c4d 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -5,7 +5,6 @@ dist_icons_DATA = niepce-jpg-fmt.png niepce-raw-fmt.png niepce-rawjpeg-fmt.png\
niepce-tiff-fmt.png niepce-png-fmt.png\
niepce-img-fmt.png niepce-unknown-fmt.png niepce-video-fmt.png\
niepce-set-star.png niepce-unset-star.png\
- niepce-rotate-left.png niepce-rotate-right.png \
niepce-flag-pick.png niepce-flag-reject.png \
niepce-transform-rotate.png \
niepce-image-generic.png \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b572e52..1b7e0f9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,7 +16,6 @@ src/niepce/ui/niepcewindow.cpp
src/niepce/ui/selectioncontroller.cpp
src/niepce/ui/workspacecontroller.cpp
src/niepce/ui/thumbstripview.cpp
-src/niepce/stock.cpp
src/niepce/modules/darkroom/toolboxcontroller.cpp
camerawire/src/cwwindow.cpp
magellan/src/mgwindow.cpp
diff --git a/src/fwk/toolkit/dockable.cpp b/src/fwk/toolkit/dockable.cpp
index 4d506bd..5f73f50 100644
--- a/src/fwk/toolkit/dockable.cpp
+++ b/src/fwk/toolkit/dockable.cpp
@@ -22,8 +22,8 @@
namespace fwk {
-Dockable::Dockable(const Glib::ustring& name,
- const Glib::ustring& long_name,
+Dockable::Dockable(const Glib::ustring& name,
+ const Glib::ustring& long_name,
const Glib::ustring& icon_name)
: m_name(name)
, m_long_name(long_name)
@@ -31,14 +31,14 @@ Dockable::Dockable(const Glib::ustring& name,
{
}
-Gtk::VBox *
+Gtk::Box *
Dockable::build_vbox()
{
- m_vbox = Gtk::manage(new Gtk::VBox());
+ m_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
// do the label, the name, etc.
// TODO
- return m_vbox;
+ return m_box;
}
}
diff --git a/src/fwk/toolkit/dockable.hpp b/src/fwk/toolkit/dockable.hpp
index 56741ff..7009826 100644
--- a/src/fwk/toolkit/dockable.hpp
+++ b/src/fwk/toolkit/dockable.hpp
@@ -40,14 +40,14 @@ public:
const Glib::ustring& icon_name);
/** return the vbox controlled (construct it if needed) */
- Gtk::VBox * build_vbox();
+ Gtk::Box * build_vbox();
const Glib::ustring & get_name() const
{
return m_name;
}
private:
- Gtk::VBox * m_vbox;
+ Gtk::Box * m_box;
Glib::ustring m_name;
Glib::ustring m_long_name;
Glib::ustring m_icon_name;
diff --git a/src/fwk/toolkit/frame.cpp b/src/fwk/toolkit/frame.cpp
index ffb4bb7..a96272f 100644
--- a/src/fwk/toolkit/frame.cpp
+++ b/src/fwk/toolkit/frame.cpp
@@ -23,7 +23,6 @@
#include <glibmm/i18n.h>
#include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
#include "fwk/base/debug.hpp"
#include "fwk/base/geometry.hpp"
@@ -133,7 +132,7 @@ void Frame::redo_state()
Glib::RefPtr<Gtk::Action> Frame::create_undo_action(const Glib::RefPtr<Gtk::ActionGroup> & g)
{
- m_undo_action = Gtk::Action::create("Undo", Gtk::Stock::UNDO);
+ m_undo_action = Gtk::Action::create("Undo", _("Undo"));
g->add(m_undo_action, Gtk::AccelKey("<control>Z"),
sigc::mem_fun(Application::app()->undo_history(),
&UndoHistory::undo));
@@ -146,7 +145,7 @@ Glib::RefPtr<Gtk::Action> Frame::create_undo_action(const Glib::RefPtr<Gtk::Acti
Glib::RefPtr<Gtk::Action> Frame::create_redo_action(const Glib::RefPtr<Gtk::ActionGroup> & g)
{
- m_redo_action = Gtk::Action::create("Redo", Gtk::Stock::REDO);
+ m_redo_action = Gtk::Action::create("Redo", _("Redo"));
g->add(m_redo_action, Gtk::AccelKey("<control><shift>Z"),
sigc::mem_fun(Application::app()->undo_history(),
&UndoHistory::redo));
diff --git a/src/fwk/toolkit/widgets/dock-item.cpp b/src/fwk/toolkit/widgets/dock-item.cpp
index 206d131..dfc78ab 100644
--- a/src/fwk/toolkit/widgets/dock-item.cpp
+++ b/src/fwk/toolkit/widgets/dock-item.cpp
@@ -12,7 +12,6 @@
#include <gtk/gtk.h>
#include <gtkmm/invisible.h>
-#include <gtkmm/stock.h>
#include <gtkmm/icontheme.h>
#include "dock-item.hpp"
diff --git a/src/fwk/toolkit/widgets/editablehscale.cpp b/src/fwk/toolkit/widgets/editablehscale.cpp
index b0b760f..09ad620 100644
--- a/src/fwk/toolkit/widgets/editablehscale.cpp
+++ b/src/fwk/toolkit/widgets/editablehscale.cpp
@@ -28,7 +28,8 @@
namespace fwk {
EditableHScale::EditableHScale(double min, double max, double step)
- : m_icon(nullptr),
+ : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL),
+ m_icon(nullptr),
m_adj(Gtk::Adjustment::create(0, min, max, step)),
m_scale(m_adj), m_entry(m_adj),
m_dirty(false)
@@ -39,7 +40,8 @@ EditableHScale::EditableHScale(double min, double max, double step)
EditableHScale::EditableHScale(const std::string & icon_path,
double min, double max, double step)
- : m_icon(Gtk::manage(new Gtk::Image(icon_path))),
+ : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL),
+ m_icon(Gtk::manage(new Gtk::Image(icon_path))),
m_adj(Gtk::Adjustment::create(0, min, max, step)),
m_scale(m_adj), m_entry(m_adj),
m_dirty(false)
diff --git a/src/fwk/toolkit/widgets/editablehscale.hpp b/src/fwk/toolkit/widgets/editablehscale.hpp
index 664854e..2bb4787 100644
--- a/src/fwk/toolkit/widgets/editablehscale.hpp
+++ b/src/fwk/toolkit/widgets/editablehscale.hpp
@@ -31,7 +31,7 @@ namespace fwk {
/** A widget similar to a Gtk::HScale with a edit box */
class EditableHScale
- : public Gtk::HBox
+ : public Gtk::Box
{
public:
EditableHScale(double min, double max, double step);
diff --git a/src/niepce/Makefile.am b/src/niepce/Makefile.am
index d66b3bb..b7533a9 100644
--- a/src/niepce/Makefile.am
+++ b/src/niepce/Makefile.am
@@ -30,7 +30,6 @@ niepce_LDADD = \
niepce_SOURCES = \
- stock.hpp stock.cpp \
notificationcenter.hpp notificationcenter.cpp \
notifications.hpp \
main.cpp
diff --git a/src/niepce/modules/darkroom/darkroommodule.cpp b/src/niepce/modules/darkroom/darkroommodule.cpp
index 22680dc..3522ca7 100644
--- a/src/niepce/modules/darkroom/darkroommodule.cpp
+++ b/src/niepce/modules/darkroom/darkroommodule.cpp
@@ -19,7 +19,6 @@
#include <gdkmm/pixbuf.h>
#include <gtkmm/toolbar.h>
-#include <gtkmm/stock.h>
#include "fwk/base/debug.hpp"
#include "fwk/toolkit/application.hpp"
@@ -33,6 +32,7 @@ namespace dr {
DarkroomModule::DarkroomModule(const ui::IModuleShell & shell,
const Glib::RefPtr<Gtk::ActionGroup> & action_group)
: m_shell(shell)
+ , m_vbox(Gtk::ORIENTATION_VERTICAL)
, m_actionGroup(action_group)
, m_image(new ncr::Image)
, m_active(false)
diff --git a/src/niepce/modules/darkroom/darkroommodule.hpp b/src/niepce/modules/darkroom/darkroommodule.hpp
index 462fe6d..5dfae85 100644
--- a/src/niepce/modules/darkroom/darkroommodule.hpp
+++ b/src/niepce/modules/darkroom/darkroommodule.hpp
@@ -68,7 +68,7 @@ private:
const ui::IModuleShell & m_shell;
// darkroom split view
Gtk::HPaned m_dr_splitview;
- Gtk::VBox m_vbox;
+ Gtk::Box m_vbox;
ImageCanvas* m_imagecanvas;
Gtk::ScrolledWindow m_canvas_scroll;
ToolboxController::Ptr m_toolbox_ctrl;
diff --git a/src/niepce/modules/darkroom/dritemwidget.cpp b/src/niepce/modules/darkroom/dritemwidget.cpp
index 13daae4..4ac949a 100644
--- a/src/niepce/modules/darkroom/dritemwidget.cpp
+++ b/src/niepce/modules/darkroom/dritemwidget.cpp
@@ -25,6 +25,7 @@ namespace dr {
DrItemWidget::DrItemWidget(const Glib::ustring & title)
: fwk::ToolboxItemWidget(title)
+ , m_box(Gtk::ORIENTATION_VERTICAL)
{
add(m_box);
m_box.set_border_width(6);
diff --git a/src/niepce/modules/darkroom/dritemwidget.hpp b/src/niepce/modules/darkroom/dritemwidget.hpp
index c1ee9b8..58bdcb7 100644
--- a/src/niepce/modules/darkroom/dritemwidget.hpp
+++ b/src/niepce/modules/darkroom/dritemwidget.hpp
@@ -37,7 +37,7 @@ public:
void add_widget(const Glib::ustring & label, Gtk::Widget &);
private:
- Gtk::VBox m_box;
+ Gtk::Box m_box;
};
diff --git a/src/niepce/modules/darkroom/toolboxcontroller.cpp
b/src/niepce/modules/darkroom/toolboxcontroller.cpp
index 4cafd71..29a02b0 100644
--- a/src/niepce/modules/darkroom/toolboxcontroller.cpp
+++ b/src/niepce/modules/darkroom/toolboxcontroller.cpp
@@ -22,7 +22,6 @@
#include <gtkmm/box.h>
#include <gtkmm/scale.h>
#include <gtkmm/adjustment.h>
-#include <gtkmm/stock.h>
#include "toolboxcontroller.hpp"
#include "fwk/base/debug.hpp"
@@ -36,7 +35,7 @@
namespace dr {
ToolboxController::ToolboxController()
- : Dockable("tools", _("Develop"), Gtk::Stock::APPLY.id)
+ : Dockable("tools", _("Develop"), "apply") // FIXME there is no equivalent it seems.
{
}
@@ -50,7 +49,7 @@ ToolboxController::buildWidget(const Glib::RefPtr<Gtk::UIManager> & )
DrItemWidget *item = nullptr;
fwk::EditableHScale *s = nullptr;
- Gtk::VBox *toolbox = Dockable::build_vbox();
+ Gtk::Box *toolbox = Dockable::build_vbox();
m_widget = toolbox;
DBG_ASSERT(toolbox, "vbox not found.");
diff --git a/src/niepce/ui/dialogs/importdialog.cpp b/src/niepce/ui/dialogs/importdialog.cpp
index 4fe99e2..1c255a4 100644
--- a/src/niepce/ui/dialogs/importdialog.cpp
+++ b/src/niepce/ui/dialogs/importdialog.cpp
@@ -28,7 +28,6 @@
#include <gtkmm/iconview.h>
#include <gtkmm/label.h>
#include <gtkmm/liststore.h>
-#include <gtkmm/stock.h>
#include <gtkmm/builder.h>
#include "fwk/base/debug.hpp"
@@ -86,7 +85,7 @@ void ImportDialog::do_select_directories()
Gtk::FileChooserDialog dialog(gtkWindow(), _("Import picture folder"),
Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
- dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ dialog.add_button(_("Cancel"), Gtk::RESPONSE_CANCEL);
dialog.add_button(_("Import"), Gtk::RESPONSE_OK);
dialog.set_select_multiple(false);
std::string last_import_location;
diff --git a/src/niepce/ui/metadatapanecontroller.cpp b/src/niepce/ui/metadatapanecontroller.cpp
index 160884e..bbfd2df 100644
--- a/src/niepce/ui/metadatapanecontroller.cpp
+++ b/src/niepce/ui/metadatapanecontroller.cpp
@@ -22,7 +22,6 @@
#include <glibmm/i18n.h>
#include <gtkmm/label.h>
#include <gtkmm/entry.h>
-#include <gtkmm/stock.h>
#include "fwk/base/debug.hpp"
#include "fwk/toolkit/metadatawidget.hpp"
@@ -103,7 +102,7 @@ const fwk::PropertySet & MetaDataPaneController::get_property_set()
MetaDataPaneController::MetaDataPaneController()
: Dockable("Metadata", _("Image Properties"),
- Gtk::Stock::PROPERTIES.id /*, DockItem::DOCKED_STATE*/),
+ "document-properties" /*, DockItem::DOCKED_STATE*/),
m_fileid(0)
{
}
@@ -118,16 +117,16 @@ MetaDataPaneController::buildWidget(const Glib::RefPtr<Gtk::UIManager> & )
if(m_widget) {
return m_widget;
}
- Gtk::VBox *vbox = build_vbox();
- m_widget = vbox;
- DBG_ASSERT(vbox, "dockable vbox not found");
+ Gtk::Box *box = build_vbox();
+ m_widget = box;
+ DBG_ASSERT(box, "dockable vbox not found");
const fwk::MetaDataSectionFormat * formats = get_format();
const fwk::MetaDataSectionFormat * current = formats;
while(current->section) {
fwk::MetaDataWidget *w = Gtk::manage(new fwk::MetaDataWidget(current->section));
- vbox->pack_start(*w, Gtk::PACK_SHRINK, 0);
+ box->pack_start(*w, Gtk::PACK_SHRINK, 0);
w->set_data_format(current);
m_widgets.push_back(w);
w->signal_metadata_changed.connect(
diff --git a/src/niepce/ui/moduleshell.cpp b/src/niepce/ui/moduleshell.cpp
index 3ad68c2..5862dd3 100644
--- a/src/niepce/ui/moduleshell.cpp
+++ b/src/niepce/ui/moduleshell.cpp
@@ -23,11 +23,9 @@
#include <gtkmm/celllayout.h>
#include <gtkmm/cellrenderer.h>
-#include <gtkmm/stock.h>
#include "fwk/base/debug.hpp"
#include "niepce/notifications.hpp"
-#include "niepce/stock.hpp"
#include "engine/db/library.hpp"
#include "engine/db/libfile.hpp"
#include "fwk/toolkit/application.hpp"
@@ -54,24 +52,24 @@ Gtk::Widget * ModuleShell::buildWidget(const Glib::RefPtr<Gtk::UIManager> & mana
m_actionGroup->add(Gtk::Action::create("MenuImage", _("_Image")));
- m_actionGroup->add(Gtk::Action::create("PrevImage", Gtk::Stock::GO_BACK),
+ m_actionGroup->add(Gtk::Action::create_with_icon_name("PrevImage", "go-previous", _("Back"), ""),
Gtk::AccelKey(GDK_KEY_Left, Gdk::ModifierType(0)),
sigc::mem_fun(*m_selection_controller,
&SelectionController::select_previous));
- m_actionGroup->add(Gtk::Action::create("NextImage", Gtk::Stock::GO_FORWARD),
+ m_actionGroup->add(Gtk::Action::create_with_icon_name("NextImage", "go-next", _("Forward"), ""),
Gtk::AccelKey(GDK_KEY_Right, Gdk::ModifierType(0)),
sigc::mem_fun(*m_selection_controller,
&SelectionController::select_next));
-
- an_action = Gtk::Action::create("RotateLeft", niepce::Stock::ROTATE_LEFT);
- m_actionGroup->add(an_action, sigc::bind(
- sigc::mem_fun(*m_selection_controller,
- &SelectionController::rotate), -90));
- an_action = Gtk::Action::create("RotateRight", niepce::Stock::ROTATE_RIGHT);
- m_actionGroup->add(an_action, sigc::bind(
- sigc::mem_fun(*m_selection_controller,
- &SelectionController::rotate), 90));
-
+
+ an_action = Gtk::Action::create_with_icon_name("RotateLeft", "object-rotate-left", _("Rotate Left"), "");
+ m_actionGroup->add(an_action, Gtk::AccelKey("["), sigc::bind(
+ sigc::mem_fun(*m_selection_controller,
+ &SelectionController::rotate), -90));
+ an_action = Gtk::Action::create_with_icon_name("RotateRight", "object-rotate-right", _("Rotate Right"),
"");
+ m_actionGroup->add(an_action, Gtk::AccelKey("]"), sigc::bind(
+ sigc::mem_fun(*m_selection_controller,
+ &SelectionController::rotate), 90));
+
m_actionGroup->add(Gtk::Action::create("SetLabel", _("Set _Label")));
m_actionGroup->add(Gtk::Action::create("SetLabel6", _("Label _6")),
Gtk::AccelKey('6', Gdk::CONTROL_MASK), sigc::bind(
@@ -93,7 +91,7 @@ Gtk::Widget * ModuleShell::buildWidget(const Glib::RefPtr<Gtk::UIManager> & mana
sigc::mem_fun(*m_selection_controller,
&SelectionController::set_label),
4));
-
+
m_actionGroup->add(Gtk::Action::create("SetRating", _("Set _Rating")));
m_actionGroup->add(Gtk::Action::create("SetRating0", _("Unrated")),
Gtk::AccelKey('0', Gdk::CONTROL_MASK), sigc::bind(
@@ -147,7 +145,7 @@ Gtk::Widget * ModuleShell::buildWidget(const Glib::RefPtr<Gtk::UIManager> & mana
&SelectionController::set_flag),
1));
- m_actionGroup->add(Gtk::Action::create("DeleteImage", Gtk::Stock::DELETE));
+ m_actionGroup->add(Gtk::Action::create("DeleteImage", _("Delete Image")));
m_actionGroup->add(Gtk::Action::create("WriteMetadata",
_("Write metadata")),
diff --git a/src/niepce/ui/moduleshellwidget.cpp b/src/niepce/ui/moduleshellwidget.cpp
index 57ef74a..001c6b4 100644
--- a/src/niepce/ui/moduleshellwidget.cpp
+++ b/src/niepce/ui/moduleshellwidget.cpp
@@ -25,7 +25,7 @@
namespace ui {
ModuleShellWidget::ModuleShellWidget()
- : Gtk::VBox(),
+ : Gtk::Box(Gtk::ORIENTATION_VERTICAL),
m_currentpage(-1)
{
set_spacing(4);
diff --git a/src/niepce/ui/moduleshellwidget.hpp b/src/niepce/ui/moduleshellwidget.hpp
index 632f8b1..7d6e888 100644
--- a/src/niepce/ui/moduleshellwidget.hpp
+++ b/src/niepce/ui/moduleshellwidget.hpp
@@ -35,7 +35,7 @@ namespace ui {
class ModuleShellWidget
- : public Gtk::VBox
+ : public Gtk::Box
{
public:
ModuleShellWidget();
diff --git a/src/niepce/ui/niepceapplication.cpp b/src/niepce/ui/niepceapplication.cpp
index 50e344b..c8fdbd7 100644
--- a/src/niepce/ui/niepceapplication.cpp
+++ b/src/niepce/ui/niepceapplication.cpp
@@ -23,7 +23,6 @@
#include <gtkmm/aboutdialog.h>
#include "fwk/utils/modulemanager.hpp"
-#include "niepce/stock.hpp"
#include "niepceapplication.hpp"
#include "niepcewindow.hpp"
@@ -35,8 +34,6 @@ namespace ui {
NiepceApplication::NiepceApplication(int & argc, char** & argv)
: Application(argc, argv, "net.figuiere.Niepce", PACKAGE)
{
- niepce::Stock::registerStockItems();
-
fwk::ModuleManager * modmgr = module_manager();
DBG_ASSERT(modmgr != NULL, "module manager is NULL.");
if(modmgr) {
diff --git a/src/niepce/ui/niepcewindow.cpp b/src/niepce/ui/niepcewindow.cpp
index 319335c..a403644 100644
--- a/src/niepce/ui/niepcewindow.cpp
+++ b/src/niepce/ui/niepcewindow.cpp
@@ -22,15 +22,13 @@
#include <glibmm/i18n.h>
#include <glibmm/miscutils.h>
#include <gtkmm/window.h>
+#include <gtkmm/accelkey.h>
#include <gtkmm/action.h>
-#include <gtkmm/box.h>
-#include <gtkmm/stock.h>
#include <gtkmm/separator.h>
#include <gtkmm/filechooserdialog.h>
#include "niepce/notifications.hpp"
#include "niepce/notificationcenter.hpp"
-#include "niepce/stock.hpp"
#include "fwk/base/debug.hpp"
#include "fwk/base/moniker.hpp"
#include "fwk/utils/boost.hpp"
@@ -59,6 +57,7 @@ namespace ui {
NiepceWindow::NiepceWindow()
: fwk::Frame("mainWindow-frame")
+ , m_vbox(Gtk::ORIENTATION_VERTICAL)
{
}
@@ -69,7 +68,7 @@ NiepceWindow::~NiepceWindow()
pApp->uiManager()->remove_action_group(m_refActionGroup);
}
-void
+void
NiepceWindow::_createModuleShell()
{
DBG_ASSERT(m_uimanager, "UI manager NULL");
@@ -227,25 +226,27 @@ void NiepceWindow::init_actions(const Glib::RefPtr<Gtk::UIManager> & manager)
Glib::RefPtr<Gtk::Action> an_action;
m_refActionGroup = Gtk::ActionGroup::create();
-
+
m_refActionGroup->add(Gtk::Action::create("MenuLibrary", _("_Library")));
- m_refActionGroup->add(Gtk::Action::create("NewLibrary", Gtk::Stock::NEW));
- m_refActionGroup->add(Gtk::Action::create("OpenLibrary", Gtk::Stock::OPEN),
- sigc::mem_fun(*this,
+ m_refActionGroup->add(Gtk::Action::create("NewLibrary", _("New")));
+ m_refActionGroup->add(Gtk::Action::create("OpenLibrary", _("Open")),
+ sigc::mem_fun(*this,
&NiepceWindow::on_action_file_open));
m_refActionGroup->add(Gtk::Action::create("NewFolder", _("New _Folder...")));
m_refActionGroup->add(Gtk::Action::create("NewProject", _("New _Project...")));
m_refActionGroup->add(Gtk::Action::create("Import", _("_Import...")),
- sigc::mem_fun(*this,
+ sigc::mem_fun(*this,
&NiepceWindow::on_action_file_import));
- m_refActionGroup->add(Gtk::Action::create("Close", Gtk::Stock::CLOSE),
- sigc::mem_fun(gtkWindow(),
- &Gtk::Window::hide));
- m_refActionGroup->add(Gtk::Action::create("Quit", Gtk::Stock::QUIT),
- sigc::mem_fun(*Application::app(),
- &Application::quit));
+ m_refActionGroup->add(Gtk::Action::create("Close", _("Close")),
+ Gtk::AccelKey("<ctrl>w"),
+ sigc::mem_fun(gtkWindow(),
+ &Gtk::Window::hide));
+ m_refActionGroup->add(Gtk::Action::create("Quit", _("Quit")),
+ Gtk::AccelKey("<ctrl>q"),
+ sigc::mem_fun(*Application::app(),
+ &Application::quit));
m_refActionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));
@@ -253,14 +254,16 @@ void NiepceWindow::init_actions(const Glib::RefPtr<Gtk::UIManager> & manager)
create_redo_action(m_refActionGroup);
// FIXME: bind
- m_refActionGroup->add(Gtk::Action::create("Cut", Gtk::Stock::CUT));
- m_refActionGroup->add(Gtk::Action::create("Copy", Gtk::Stock::COPY));
- m_refActionGroup->add(Gtk::Action::create("Paste", Gtk::Stock::PASTE));
- m_refActionGroup->add(Gtk::Action::create("Delete", Gtk::Stock::DELETE),
+ m_refActionGroup->add(Gtk::Action::create("Cut", _("Cut")),
+ Gtk::AccelKey("<ctrl>x"));
+ m_refActionGroup->add(Gtk::Action::create("Copy", _("Copy")),
+ Gtk::AccelKey("<ctrl>c"));
+ m_refActionGroup->add(Gtk::Action::create("Paste", _("Paste")),
+ Gtk::AccelKey("<ctrl>v"));
+ m_refActionGroup->add(Gtk::Action::create("Delete", _("Delete")),
sigc::mem_fun(*this, &NiepceWindow::on_action_edit_delete));
- m_refActionGroup->add(Gtk::Action::create("Preferences",
- Gtk::Stock::PREFERENCES),
+ m_refActionGroup->add(Gtk::Action::create("Preferences", _("Preferences...")),
sigc::mem_fun(*this,
&NiepceWindow::on_preferences));
@@ -276,8 +279,8 @@ void NiepceWindow::init_actions(const Glib::RefPtr<Gtk::UIManager> & manager)
sigc::mem_fun(*this, &Frame::toggle_tools_visible));
m_refActionGroup->add(Gtk::Action::create("MenuHelp", _("_Help")));
- m_refActionGroup->add(Gtk::Action::create("Help", Gtk::Stock::HELP));
- m_refActionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),
+ m_refActionGroup->add(Gtk::Action::create("Help", _("Help")));
+ m_refActionGroup->add(Gtk::Action::create("About", _("About")),
sigc::mem_fun(*Application::app(),
&Application::about));
@@ -421,7 +424,7 @@ std::string NiepceWindow::prompt_open_library()
std::string libMoniker;
Gtk::FileChooserDialog dialog(gtkWindow(), _("Create library"),
Gtk::FILE_CHOOSER_ACTION_CREATE_FOLDER);
- dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ dialog.add_button(_("Cancel"), Gtk::RESPONSE_CANCEL);
dialog.add_button(_("Create"), Gtk::RESPONSE_OK);
int result = dialog.run();
diff --git a/src/niepce/ui/niepcewindow.hpp b/src/niepce/ui/niepcewindow.hpp
index d77150e..0f2629b 100644
--- a/src/niepce/ui/niepcewindow.hpp
+++ b/src/niepce/ui/niepcewindow.hpp
@@ -86,7 +86,7 @@ private:
niepce::NotificationCenter::Ptr m_notifcenter;
- Gtk::VBox m_vbox;
+ Gtk::Box m_vbox;
Gtk::HPaned m_hbox;
ModuleShell::Ptr m_moduleshell; // the main views stacked.
WorkspaceController::Ptr m_workspacectrl;
diff --git a/src/niepce/ui/workspacecontroller.cpp b/src/niepce/ui/workspacecontroller.cpp
index 70346ce..fdebc29 100644
--- a/src/niepce/ui/workspacecontroller.cpp
+++ b/src/niepce/ui/workspacecontroller.cpp
@@ -42,6 +42,7 @@ namespace ui {
WorkspaceController::WorkspaceController()
: fwk::UiController()
+ , m_vbox(Gtk::ORIENTATION_VERTICAL)
{
static struct _Icons {
int icon_id;
diff --git a/src/niepce/ui/workspacecontroller.hpp b/src/niepce/ui/workspacecontroller.hpp
index d69fdfd..1b669c2 100644
--- a/src/niepce/ui/workspacecontroller.hpp
+++ b/src/niepce/ui/workspacecontroller.hpp
@@ -127,7 +127,7 @@ private:
};
std::array< Glib::RefPtr<Gdk::Pixbuf>, _ICON_SIZE > m_icons;
WorkspaceTreeColumns m_librarycolumns;
- Gtk::VBox m_vbox;
+ Gtk::Box m_vbox;
Gtk::Label m_label;
Gtk::TreeView m_librarytree;
Gtk::TreeModel::iterator m_folderNode; /**< the folder node */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
