X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=ffca6fd3970bf31e3eb93f6ed0369d26cbc6d1b9;hb=d76982128319a00cb5fc30a119304865da55d8cf;hp=64f0f324209c3eb8ff646ebcacce16e6f584221a;hpb=d58be04cc06d8bcf0a18f7830026b3ace4da7316;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 64f0f32..ffca6fd 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -542,7 +542,7 @@ public:
 			value=strprintf("%s",App::predefined_size.c_str());
 			return true;
 		}
-		
+
 		return synfigapp::Settings::get_value(key,value);
 	}
 
@@ -660,7 +660,7 @@ public:
 		ret.push_back("custom_filename_prefix");
 		ret.push_back("preferred_x_size");
 		ret.push_back("preferred_y_size");
-		ret.push_back("predefined_size");		
+		ret.push_back("predefined_size");
 		return ret;
 	}
 };
@@ -1058,7 +1058,7 @@ init_ui_manager()
 	ACCEL("<Control>0",													"<Actions>//quality-10"						);
 	ACCEL("<Control>z",													"<Actions>//undo"							);
 	ACCEL("<Control>r",													"<Actions>//redo"							);
-	ACCEL("Delete",														"<Actions>//action-LayerRemove"				);
+	ACCEL2(Gtk::AccelKey(GDK_Delete,Gdk::CONTROL_MASK,					"<Actions>//action-LayerRemove"				));
 	ACCEL2(Gtk::AccelKey('(',Gdk::CONTROL_MASK,							"<Actions>//decrease-low-res-pixel-size"	));
 	ACCEL2(Gtk::AccelKey(')',Gdk::CONTROL_MASK,							"<Actions>//increase-low-res-pixel-size"	));
 	ACCEL2(Gtk::AccelKey('(',Gdk::MOD1_MASK|Gdk::CONTROL_MASK,			"<Actions>//amount-dec"						));
@@ -1073,7 +1073,7 @@ init_ui_manager()
 	ACCEL2(Gtk::AccelKey(',',Gdk::CONTROL_MASK,							"<Actions>//seek-prev-frame"				));
 	ACCEL2(Gtk::AccelKey('>',Gdk::CONTROL_MASK,							"<Actions>//seek-next-second"				));
 	ACCEL2(Gtk::AccelKey('<',Gdk::CONTROL_MASK,							"<Actions>//seek-prev-second"				));
-	ACCEL2(Gtk::AccelKey('o',Gdk::MOD1_MASK,							"<Actions>//toggle-onion-skin"				));
+	ACCEL("<Mod1>o",													"<Actions>//toggle-onion-skin"				);
 	ACCEL("<Control><Shift>z",											"<Actions>//canvas-zoom-fit"				);
 	ACCEL("<Control>p",													"<Actions>//play"							);
 	ACCEL("Home",														"<Actions>//seek-begin"						);
@@ -1272,7 +1272,7 @@ App::App(int *argc, char ***argv):
 		studio_init_cb.task(_("Init Input Dialog..."));
 		dialog_input=new Gtk::InputDialog();
 		dialog_input->get_close_button()->signal_clicked().connect( sigc::mem_fun( *dialog_input, &Gtk::InputDialog::hide ) );
-		dialog_input->get_save_button()->signal_clicked().connect( sigc::ptr_fun(studio::App::dialog_not_implemented) );
+		dialog_input->get_save_button()->signal_clicked().connect( sigc::mem_fun( *device_tracker, &DeviceTracker::save_preferences) );
 
 		studio_init_cb.task(_("Init auto recovery..."));
 		auto_recover=new AutoRecover();
@@ -1280,6 +1280,8 @@ App::App(int *argc, char ***argv):
 		studio_init_cb.amount_complete(9250,10000);
 		studio_init_cb.task(_("Loading Settings..."));
 		load_settings();
+		device_tracker->load_preferences();
+
 		studio_init_cb.task(_("Checking auto-recover..."));
 
 		studio_init_cb.amount_complete(9900,10000);
@@ -1368,7 +1370,7 @@ App::~App()
 	delete auto_recover;
 
 	delete about;
-	
+
 	toolbox->hide();
 
 //	studio::App::iteration(false);
@@ -2221,7 +2223,7 @@ try_open_url(const std::string &url)
 			try { Glib::spawn_async(".", command_line, Glib::SPAWN_SEARCH_PATH); }
 			// Failed, move on to the next one
 			catch(Glib::SpawnError& exception){ continue; }
-			return true; // No exception means we succeeded!			
+			return true; // No exception means we succeeded!
 		}
 	}
 
@@ -2361,7 +2363,7 @@ App::open_as(std::string filename,std::string as)
 
 			if (warnings != "")
 				dialog_warning_blocking(_("Warnings"), strprintf("%s:\n\n%s", _("Warnings"), warnings.c_str()));
-			
+
 			if (as.find(custom_filename_prefix.c_str()) != 0)
 				add_recent_file(as);