Commit f510d286 authored by Murray Cumming's avatar Murray Cumming Committed by Murray Cumming
Browse files

0.8.34:

2005-07-15  Murray Cumming  <murrayc@murrayc.com>

        * examples/example_smallbusiness.cc: Contacts table: Made the ID
        autoincrement again and added choice for Title. This got lost
        somehow. Changed database name again to avoid clash with already-
        created examples.
        * glom/utility_widgets/imageglom.cc:
        * glom/utility_widgets/imageglom.h: Added a Clear context menu item.
parent b9245218
0.8.34:
2005-07-15 Murray Cumming <murrayc@murrayc.com>
* examples/example_smallbusiness.cc: Contacts table: Made the ID
autoincrement again and added choice for Title. This got lost
somehow. Changed database name again to avoid clash with already-
created examples.
* glom/utility_widgets/imageglom.cc:
* glom/utility_widgets/imageglom.h: Added a Clear context menu item.
2005-07-15 Murray Cumming <murrayc@murrayc.com>
* glom/base_db.cc: Comment out the debug query output on
......
0.8.34:
* Prevented crash at startup. (Daniel Holbach)
* Added Image field type. (Murray Cumming)
0.8.33:
* Details layout: Group names can be changed again.
......
......@@ -4,7 +4,7 @@ AC_INIT(glom/main.cc)
AM_CONFIG_HEADER(config.h)
# Package name and version number:
AM_INIT_AUTOMAKE(glom, 0.8.33)
AM_INIT_AUTOMAKE(glom, 0.8.34)
AM_MAINTAINER_MODE
......
This diff is collapsed.
......@@ -305,7 +305,6 @@ void App_Glom::init_menus()
" <menuitem action='GlomAction_Menu_Developer_Database_Preferences' />"
" <menuitem action='GlomAction_Menu_Developer_Fields' />"
" <menuitem action='GlomAction_Menu_Developer_Relationships' />"
" <menuitem action='GlomAction_Menu_Developer_RelationshipsOverview' />"
" <menuitem action='GlomAction_Menu_Developer_Layout' />"
" <menuitem action='GlomAction_Menu_Developer_Users' />"
" <menuitem action='GlomAction_Menu_Developer_Reports' />"
......@@ -314,6 +313,8 @@ void App_Glom::init_menus()
" </menubar>"
"</ui>";
/* " <menuitem action='GlomAction_Menu_Developer_RelationshipsOverview' />" */
//Add menu:
add_ui_from_string(ui_description);
......
......@@ -414,6 +414,12 @@ void ImageGlom::on_menupopup_activate_paste()
refClipboard->request_image( sigc::mem_fun(*this, &ImageGlom::on_clipboard_received_image) );
}
void ImageGlom::on_menupopup_activate_clear()
{
m_pixbuf_original.clear();
m_image.set(Gtk::Stock::MISSING_IMAGE, Gtk::ICON_SIZE_DIALOG);
}
void ImageGlom::setup_menu_usermode()
{
m_refActionGroup_UserModePopup = Gtk::ActionGroup::create();
......@@ -422,7 +428,7 @@ void ImageGlom::setup_menu_usermode()
m_refActionSelectFile = Gtk::Action::create("ContextSelectFile", Gtk::Stock::EDIT, _("Choose File"));
m_refActionCopy = Gtk::Action::create("ContextCopy", Gtk::Stock::COPY);
m_refActionPaste = Gtk::Action::create("ContextPaste", Gtk::Stock::PASTE);
m_refActionClear = Gtk::Action::create("ContextClear", Gtk::Stock::CLEAR);
m_refActionGroup_UserModePopup->add(m_refActionSelectFile,
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_select_file) );
......@@ -432,6 +438,9 @@ void ImageGlom::setup_menu_usermode()
m_refActionGroup_UserModePopup->add(m_refActionPaste,
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_paste) );
m_refActionGroup_UserModePopup->add(m_refActionClear,
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_clear) );
m_refUIManager_UserModePopup = Gtk::UIManager::create();
......@@ -447,6 +456,7 @@ void ImageGlom::setup_menu_usermode()
" <menuitem action='ContextSelectFile'/>"
" <menuitem action='ContextCopy'/>"
" <menuitem action='ContextPaste'/>"
" <menuitem action='ContextClear'/>"
" </popup>"
"</ui>";
......
......@@ -46,6 +46,7 @@ protected:
void on_menupopup_activate_select_file();
void on_menupopup_activate_copy();
void on_menupopup_activate_paste();
void on_menupopup_activate_clear();
void on_clipboard_get(Gtk::SelectionData& selection_data, guint /* info */);
void on_clipboard_clear();
......@@ -66,7 +67,7 @@ protected:
Gtk::Menu* m_pMenuPopup_UserMode;
Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup_UserModePopup;
Glib::RefPtr<Gtk::UIManager> m_refUIManager_UserModePopup;
Glib::RefPtr<Gtk::Action> m_refActionSelectFile, m_refActionCopy, m_refActionPaste;
Glib::RefPtr<Gtk::Action> m_refActionSelectFile, m_refActionCopy, m_refActionPaste, m_refActionClear;
};
#endif //GLOM_UTILITY_WIDGETS_COMBOENTRY_GLOM_H
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment