update icon, use it on all dialogs

(GH-87)
timschmidt · Feb 5, 2013 · c358b5a · c358b5a
1 parent e942e59
commit c358b5a
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 57 deletions.
diff --git a/src/repsnapper-icon.svg b/src/repsnapper-icon.svg
diff --git a/src/repsnapper.cpp b/src/repsnapper.cpp
@@ -310,10 +310,7 @@ int main(int argc, char **argv)
   mainwin->setNonPrintingMode(nonprintingmode, opts.gcode_output_path);
 
   Glib::RefPtr<Gio::File> iconfile = find_global_config("repsnapper-icon.svg");
-  if (iconfile)
-    mainwin->set_icon_from_file(iconfile->get_path());
-  else
-    mainwin->set_icon_name("gtk-convert");
+  mainwin->set_icon_file(iconfile);
   mainwin->set_title("Repsnapper");
 
   if (opts.stl_input_path.size() > 0) {

diff --git a/src/ui/prefs_dlg.h b/src/ui/prefs_dlg.h
@@ -38,6 +38,7 @@ class PrefsDlg {
   PrefsDlg(Model *model, Glib::RefPtr<Gtk::Builder> &builder);
   ~PrefsDlg();
   void show();
+  void set_icon_from_file(const string path) {m_preferences_dlg->set_icon_from_file(path);}
 };
 
 #endif // SETTINGS_H
diff --git a/src/ui/view.cpp b/src/ui/view.cpp
@@ -591,6 +591,17 @@ void View::hide_on_response(int, Gtk::Dialog *dialog)
   dialog->hide();
 }
 
+void View::set_icon_file(Glib::RefPtr<Gio::File> file)
+{
+  iconfile = file;
+  if (iconfile) {
+    set_icon_from_file(iconfile->get_path());
+    m_settings_ui->set_icon_from_file(iconfile->get_path());
+  } else
+    set_icon_name("gtk-convert");
+}
+
+
 void View::show_dialog(const char *name)
 {
   Gtk::Dialog *dialog;
@@ -599,7 +610,10 @@ void View::show_dialog(const char *name)
     cerr << "no such dialog " << name << "\n";
     return;
   }
-  dialog->set_icon_name("gtk-convert");
+  if (iconfile)
+    dialog->set_icon_from_file(iconfile->get_path());
+  else
+    dialog->set_icon_name("gtk-convert");
   dialog->signal_response().connect (sigc::bind(sigc::mem_fun(*this, &View::hide_on_response), dialog));
   dialog->show();
   //  dialog->set_transient_for (*this);

diff --git a/src/ui/view.h b/src/ui/view.h
@@ -233,6 +233,9 @@ class View : public Gtk::Window
 
   Glib::Mutex mutex;
 
+  Glib::RefPtr<Gio::File> iconfile;
+  void set_icon_file(Glib::RefPtr<Gio::File> iconfile);
+
 };
 
 #ifdef MODEL_IMPLEMENTATION