X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fautosave.cpp;h=9921d4be4d9cd100e6b109cabab3b87fc3345f0c;hb=80bb5fdd23e124b4c4da8509634d95d1459e6a3b;hp=fe42687cc640d12bb2e877cea69c4f669074407e;hpb=e4287c28bb2dafedc81c66e63951d947cfbeb225;p=xonotic%2Fnetradiant.git

diff --git a/radiant/autosave.cpp b/radiant/autosave.cpp
index fe42687c..9921d4be 100644
--- a/radiant/autosave.cpp
+++ b/radiant/autosave.cpp
@@ -19,7 +19,9 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <uilib/uilib.h>
 #include "autosave.h"
+#include "globaldefs.h"
 
 #include "os/file.h"
 #include "os/path.h"
@@ -35,7 +37,7 @@
 #include "preferences.h"
 
 
-#if defined( WIN32 )
+#if GDEF_OS_WINDOWS
 #define PATH_MAX 260
 #endif
 
@@ -91,7 +93,7 @@ void Map_Snapshot(){
 	{
 		StringOutputStream strMsg( 256 );
 		strMsg << "Snapshot save failed.. unabled to create directory\n" << snapshotsDir.c_str();
-		gtk_MessageBox( GTK_WIDGET( MainFrame_getWindow() ), strMsg.c_str() );
+		ui::alert( MainFrame_getWindow(), strMsg.c_str() );
 	}
 }
 /*
@@ -174,8 +176,8 @@ void QE_CheckAutoSave( void ){
 }
 
 void Autosave_constructPreferences( PreferencesPage& page ){
-	GtkWidget* autosave_enabled = page.appendCheckBox( "Autosave", "Enable Autosave", g_AutoSave_Enabled );
-	GtkWidget* autosave_frequency = page.appendSpinner( "Autosave Frequency (minutes)", m_AutoSave_Frequency, 1, 1, 60 );
+	ui::CheckButton autosave_enabled = page.appendCheckBox( "Autosave", "Enable Autosave", g_AutoSave_Enabled );
+	ui::SpinButton autosave_frequency = page.appendSpinner( "Autosave Frequency (minutes)", m_AutoSave_Frequency, 1, 1, 60 );
 	Widget_connectToggleDependency( autosave_frequency, autosave_enabled );
 	page.appendCheckBox( "", "Save Snapshots", g_SnapShots_Enabled );
 }
@@ -184,7 +186,7 @@ void Autosave_constructPage( PreferenceGroup& group ){
 	Autosave_constructPreferences( page );
 }
 void Autosave_registerPreferencesPage(){
-	PreferencesDialog_addSettingsPage( FreeCaller1<PreferenceGroup&, Autosave_constructPage>() );
+	PreferencesDialog_addSettingsPage(makeCallbackF(Autosave_constructPage));
 }
 
 
@@ -192,9 +194,9 @@ void Autosave_registerPreferencesPage(){
 #include "stringio.h"
 
 void Autosave_Construct(){
-	GlobalPreferenceSystem().registerPreference( "Autosave", BoolImportStringCaller( g_AutoSave_Enabled ), BoolExportStringCaller( g_AutoSave_Enabled ) );
-	GlobalPreferenceSystem().registerPreference( "AutosaveMinutes", IntImportStringCaller( m_AutoSave_Frequency ), IntExportStringCaller( m_AutoSave_Frequency ) );
-	GlobalPreferenceSystem().registerPreference( "Snapshots", BoolImportStringCaller( g_SnapShots_Enabled ), BoolExportStringCaller( g_SnapShots_Enabled ) );
+	GlobalPreferenceSystem().registerPreference( "Autosave", make_property_string( g_AutoSave_Enabled ) );
+	GlobalPreferenceSystem().registerPreference( "AutosaveMinutes", make_property_string( m_AutoSave_Frequency ) );
+	GlobalPreferenceSystem().registerPreference( "Snapshots", make_property_string( g_SnapShots_Enabled ) );
 
 	Autosave_registerPreferencesPage();
 }