X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=e99a21d152a77f07f17fc035f06462b9f4e9a171;hb=1c412be8fd05bcdee259fc61ebee162bc4e3bf67;hp=b201fa9dc5e4e9dd39b0ce4bebdee5f4df5a52d6;hpb=8f8a2139a0a6f405a4186dc05a4c1eca787794e4;p=synfig.git
diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index b201fa9..e99a21d 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -136,8 +136,10 @@ using namespace studio;
#ifndef SYNFIG_USER_APP_DIR
#ifdef __APPLE__
#define SYNFIG_USER_APP_DIR "Library/Synfig"
-#else
+#elif defined(_WIN32)
#define SYNFIG_USER_APP_DIR "Synfig"
+#else
+#define SYNFIG_USER_APP_DIR ".synfig"
#endif
#endif
@@ -350,7 +352,7 @@ public:
}
virtual bool
- amount_complete(int current, int total)
+ amount_complete(int /*current*/, int /*total*/)
{
while(studio::App::events_pending())studio::App::iteration(false);
return true;
@@ -456,7 +458,15 @@ int v_key_check(const char* key, U32* serial, U32 appid)
}
+#ifdef _WIN32
+# ifdef LICENSE_KEY_REQUIRED
int check_license(String basedir)
+# else
+int check_license(String /*basedir*/)
+# endif
+#else
+int check_license(String /*basedir*/)
+#endif
{
#ifdef LICENSE_KEY_REQUIRED
String key;
@@ -747,7 +757,7 @@ init_ui_manager()
DEFINE_ACTION("quality-09", _("Use Quality Level 9"));
DEFINE_ACTION("quality-10", _("Use Quality Level 10"));
DEFINE_ACTION("play", _("Play"));
- DEFINE_ACTION("pause", _("Pause"));
+ // DEFINE_ACTION("pause", _("Pause"));
DEFINE_ACTION("stop", _("Stop"));
DEFINE_ACTION("toggle-grid-show", _("Toggle Grid Show"));
DEFINE_ACTION("toggle-grid-snap", _("Toggle Grid Snap"));
@@ -875,7 +885,7 @@ init_ui_manager()
" "
" "
" "
-" "
+//" "
" "
" "
" "
@@ -904,8 +914,6 @@ init_ui_manager()
" "
"
"
" "
@@ -918,6 +926,8 @@ init_ui_manager()
//" "
//" "
" "
+" "
+" "
" "
"