GNOME.org
 

[glom/glom-1-14] Set default icon instead of individual window icons.

commit 04685925cdf86c2b613dbeedf70d1fd6067aa1d4
Author: Daniel Borgmann <danielb openismus com>
Date:   Mon May 3 14:21:40 2010 +0100

    Set default icon instead of individual window icons.
    
    * glom/application.cc: Set default window icon.
    
    * glom/dialog_existing_or_new.cc:
    * glom/filechooser_export.cc:
    * glom/frame_glom.cc:
    * glom/glade_utils.h:
    * glom/mode_design/script_library/dialog_script_library.cc:
    * glom/mode_design/translation/window_translations.cc:
    * glom/mode_design/users/dialog_groups_list.cc:
    * glom/utility_widgets/filechooserdialog_saveextras.cc:
    * glom/utils_ui.cc:
    * glom/window_boxholder.cc:
    
    Don't call set_icon_name() on individual windows.

 ChangeLog                                          |   21 ++++++++++++++++++-
 glom/application.cc                                |    2 +-
 glom/dialog_existing_or_new.cc                     |    1 -
 glom/filechooser_export.cc                         |    3 --
 glom/frame_glom.cc                                 |    8 -------
 glom/glade_utils.h                                 |    7 ------
 .../script_library/dialog_script_library.cc        |    1 -
 .../mode_design/translation/window_translations.cc |    2 -
 glom/mode_design/users/dialog_groups_list.cc       |    1 -
 .../filechooserdialog_saveextras.cc                |    2 -
 glom/utils_ui.cc                                   |    1 -
 glom/window_boxholder.cc                           |    3 --
 12 files changed, 20 insertions(+), 32 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d919b0a..999d4b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-05-03  Daniel Borgmann  <danielb openismus com>
+
+	Set default icon instead of individual window icons.
+
+	* glom/application.cc: Set default window icon.
+
+	* glom/dialog_existing_or_new.cc:
+	* glom/filechooser_export.cc:
+	* glom/frame_glom.cc:
+	* glom/glade_utils.h:
+	* glom/mode_design/script_library/dialog_script_library.cc:
+	* glom/mode_design/translation/window_translations.cc:
+	* glom/mode_design/users/dialog_groups_list.cc:
+	* glom/utility_widgets/filechooserdialog_saveextras.cc:
+	* glom/utils_ui.cc:
+	* glom/window_boxholder.cc:
+
+	Don't call set_icon_name() on individual windows.
+
 2010-05-12 Daniel Borgmann <danielb openismus com>
 
 	Don't allow deleting placeholder rows.
@@ -60,8 +79,6 @@
 
 	* configure.ac: Don't check for avahi-ui.
 	* glom/application.cc: Don't include avahi-ui.h
-	
-	This is lucky, because avahi-ui still has no support for GTK+ 3.
 
 1.14.2:
 
diff --git a/glom/application.cc b/glom/application.cc
index 95a6876..79d28b6 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -89,7 +89,7 @@ Application::Application(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builde
 #endif // !GLOM_ENABLE_CLIENT_ONLY
   m_show_sql_debug(false)
 {
-  set_icon_name("glom");
+  Gtk::Window::set_default_icon_name("glom");
 
   //Load widgets from glade file:
   builder->get_widget("bakery_vbox", m_pBoxTop);
diff --git a/glom/dialog_existing_or_new.cc b/glom/dialog_existing_or_new.cc
index 8618a28..ef5dd53 100644
--- a/glom/dialog_existing_or_new.cc
+++ b/glom/dialog_existing_or_new.cc
@@ -962,7 +962,6 @@ void Dialog_ExistingOrNew::on_select_clicked()
     Hildon::FileChooserDialog dialog(Gtk::FILE_CHOOSER_ACTION_OPEN);
     #else
     Gtk::FileChooserDialog dialog(*this, "Open Glom File");
-    dialog.set_icon_name("glom");
     dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
     dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
     dialog.set_default_response(Gtk::RESPONSE_OK);
diff --git a/glom/filechooser_export.cc b/glom/filechooser_export.cc
index 6f82d5e..cb2b77e 100644
--- a/glom/filechooser_export.cc
+++ b/glom/filechooser_export.cc
@@ -37,8 +37,6 @@ FileChooser_Export::FileChooser_Export()
 #endif //GLOM_ENABLE_CLIENT_ONLY
   m_document(0)
 {
-  set_icon_name("glom");
-
   add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
   add_button(_("_Export"), Gtk::RESPONSE_OK);
 
@@ -59,7 +57,6 @@ FileChooser_Export::FileChooser_Export()
   Utils::get_glade_widget_derived_with_warning(dialog);
   
   m_pDialogLayout = dialog;
-  m_pDialogLayout->set_icon_name("glom");
   //add_view(m_pDialogLayout); //Give it access to the document.
   m_pDialogLayout->signal_hide().connect( sigc::mem_fun(*this, &FileChooser_Export::on_dialog_layout_hide) );
 #endif //GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 2a8e75b..1859316 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -570,7 +570,6 @@ void Frame_Glom::on_menu_userlevel_Developer(const Glib::RefPtr<Gtk::RadioAction
           //TODO: Obviously this could be possible but it would require a network protocol and some work:
           Gtk::MessageDialog dialog(Utils::bold_message(_("Developer mode not available.")), true, Gtk::MESSAGE_WARNING);
           dialog.set_secondary_text(_("Developer mode is not available because the file was opened over the network from a running Glom. Only the original file may be edited."));
-          dialog.set_icon_name("glom");
           dialog.set_transient_for(*get_app_window());
           dialog.run();
         }
@@ -578,7 +577,6 @@ void Frame_Glom::on_menu_userlevel_Developer(const Glib::RefPtr<Gtk::RadioAction
         {
           Gtk::MessageDialog dialog(Utils::bold_message(_("Developer mode not available")), true, Gtk::MESSAGE_WARNING);
           dialog.set_secondary_text(_("Developer mode is not available. Check that you have sufficient database access rights and that the glom file is not read-only."));
-          dialog.set_icon_name("glom");
           dialog.set_transient_for(*get_app_window());
           dialog.run();
         }
@@ -587,7 +585,6 @@ void Frame_Glom::on_menu_userlevel_Developer(const Glib::RefPtr<Gtk::RadioAction
       {
         Gtk::MessageDialog dialog(Utils::bold_message(_("Saving in new document format")), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE);
         dialog.set_secondary_text(_("The document was created by an earlier version of the application. Making changes to the document will mean that the document cannot be opened by some earlier versions of the application."));
-        dialog.set_icon_name("glom");
         dialog.set_transient_for(*get_app_window());
         dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
         dialog.add_button(_("Continue"), Gtk::RESPONSE_OK);
@@ -877,7 +874,6 @@ void Frame_Glom::on_menu_file_import()
   else
   {
     Gtk::FileChooserDialog file_chooser(*get_app_window(), _("Open CSV Document"), Gtk::FILE_CHOOSER_ACTION_OPEN);
-    file_chooser.set_icon_name("glom");
     file_chooser.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
     file_chooser.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
     Gtk::FileFilter filter_csv;
@@ -958,7 +954,6 @@ void Frame_Glom::on_menu_file_toggle_share(const Glib::RefPtr<Gtk::ToggleAction>
   if(shared)
   {
     Gtk::MessageDialog dialog(Utils::bold_message(_("Share on the network")), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE);
-    dialog.set_icon_name("glom");
     dialog.set_secondary_text(_("This will allow other users on the network to use this database."));
     dialog.set_transient_for(*get_app_window());
     dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@@ -1059,7 +1054,6 @@ void Frame_Glom::on_menu_file_toggle_share(const Glib::RefPtr<Gtk::ToggleAction>
     //TODO: Warn about connected users if possible.
     Gtk::MessageDialog dialog(Utils::bold_message(_("Stop sharing on the network")), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE);
     dialog.set_secondary_text(_("This will prevent other users on the network from using this database."));
-    dialog.set_icon_name("glom");
     dialog.set_transient_for(*get_app_window());
     dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
     dialog.add_button(_("_Stop Sharing"), Gtk::RESPONSE_OK);
@@ -1457,7 +1451,6 @@ void Frame_Glom::on_button_quickfind()
     note.run();
 #else
     Gtk::MessageDialog dialog(Utils::bold_message(_("No find criteria")), true, Gtk::MESSAGE_WARNING );
-    dialog.set_icon_name("glom");
     dialog.set_secondary_text(message);
     dialog.set_transient_for(*get_app_window());
     dialog.run();
@@ -1742,7 +1735,6 @@ void Frame_Glom::on_menu_developer_relationships_overview()
 
   if(m_dialog_relationships_overview)
   {
-    m_dialog_relationships_overview->set_icon_name("glom");
     m_dialog_relationships_overview->set_transient_for(*(get_app_window()));
     m_dialog_relationships_overview->load_from_document();
 
diff --git a/glom/glade_utils.h b/glom/glade_utils.h
index 673d68b..ebf6f62 100644
--- a/glom/glade_utils.h
+++ b/glom/glade_utils.h
@@ -92,13 +92,6 @@ void helper_get_glade_widget_derived_with_warning(const std::string& filename, c
   {
     refXml->get_widget_derived(id, widget);
   }
-
-  // Make sure that all windows have the Glom icon.
-  // TODO: Though shouldn't all transient windows have this by default,
-  // or should they even be visible in the task list? murrayc
-  Gtk::Window* window = dynamic_cast<Gtk::Window*>(widget);
-  if(window)
-    window->set_icon_name("glom");
 }
 
 template<class T_Widget>
diff --git a/glom/mode_design/script_library/dialog_script_library.cc b/glom/mode_design/script_library/dialog_script_library.cc
index 926fb53..f357545 100644
--- a/glom/mode_design/script_library/dialog_script_library.cc
+++ b/glom/mode_design/script_library/dialog_script_library.cc
@@ -127,7 +127,6 @@ void Dialog_ScriptLibrary::on_button_remove()
   dialog.set_secondary_text(_("Do you really want to delete this script? This data can not be recovered"));
   dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
   dialog.add_button(Gtk::Stock::REMOVE, Gtk::RESPONSE_OK);
-  dialog.set_icon_name("glom");
   dialog.set_transient_for(*this);
   const int response = dialog.run();
   dialog.hide();
diff --git a/glom/mode_design/translation/window_translations.cc b/glom/mode_design/translation/window_translations.cc
index 33751b7..277ac26 100644
--- a/glom/mode_design/translation/window_translations.cc
+++ b/glom/mode_design/translation/window_translations.cc
@@ -495,7 +495,6 @@ void Window_Translations::on_button_export()
   
   //Show the file-chooser dialog, to select an output .po file:
   Gtk::FileChooserDialog file_dlg(_("Choose .po File Name"), Gtk::FILE_CHOOSER_ACTION_SAVE);
-  file_dlg.set_icon_name("glom");
   file_dlg.set_do_overwrite_confirmation();
   
   // Only po files
@@ -574,7 +573,6 @@ void Window_Translations::on_button_import()
     return;
 
   Gtk::FileChooserDialog file_dlg(_("Choose .po File Name"), Gtk::FILE_CHOOSER_ACTION_OPEN);
-  file_dlg.set_icon_name("glom");
 
   // Only po files
   Gtk::FileFilter filter;
diff --git a/glom/mode_design/users/dialog_groups_list.cc b/glom/mode_design/users/dialog_groups_list.cc
index a4f1a38..7fd3fa8 100644
--- a/glom/mode_design/users/dialog_groups_list.cc
+++ b/glom/mode_design/users/dialog_groups_list.cc
@@ -214,7 +214,6 @@ void Dialog_GroupsList::on_button_group_delete()
         //TODO: Prevent deletion of standard groups
         Gtk::MessageDialog dialog(Utils::bold_message(_("Delete Group")), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL);
         dialog.set_secondary_text(_("Are your sure that you wish to delete this group?"));
-        dialog.set_icon_name("glom");
         dialog.set_transient_for(*this);
 
         int response = dialog.run();
diff --git a/glom/utility_widgets/filechooserdialog_saveextras.cc b/glom/utility_widgets/filechooserdialog_saveextras.cc
index 3a87bae..f011aa2 100644
--- a/glom/utility_widgets/filechooserdialog_saveextras.cc
+++ b/glom/utility_widgets/filechooserdialog_saveextras.cc
@@ -64,8 +64,6 @@ void FileChooserDialog_SaveExtras::set_extra_message(const Glib::ustring& messag
 
 void FileChooserDialog_SaveExtras::create_child_widgets()
 {
-  set_icon_name("glom");
-
   //m_extra_widget.pack_start(m_label_extra_message);
   m_label_extra_message.set_alignment(0.0f, 0.5f);
   m_label_extra_message.show();
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 5e7f734..308a6fd 100644
--- a/glom/utils_ui.cc
+++ b/glom/utils_ui.cc
@@ -174,7 +174,6 @@ void Utils::show_ok_dialog(const Glib::ustring& title, const Glib::ustring& mess
 #else
   Gtk::MessageDialog dialog("<b>" + title + "</b>", true /* markup */, message_type, Gtk::BUTTONS_OK);
   dialog.set_secondary_text(message);
-  dialog.set_icon_name("glom");
   if(parent)
     dialog.set_transient_for(*parent);
 #endif
diff --git a/glom/window_boxholder.cc b/glom/window_boxholder.cc
index 39aec59..fe1c0d0 100644
--- a/glom/window_boxholder.cc
+++ b/glom/window_boxholder.cc
@@ -31,9 +31,6 @@ Window_BoxHolder::Window_BoxHolder(Box_WithButtons* pBox, const Glib::ustring& t
   if(!title.empty())
     set_title(title);
 
-  //Use the glom icon by default:
-  set_icon_name("glom");
-
   //Set default position:
   set_position(Gtk::WIN_POS_CENTER_ON_PARENT);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]