supports XDG_CONFIG_HOME on Linux

[xonotic/netradiant.git] / radiant / mainframe.cpp

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index b86d69ecf78fde3ecb2cb1397806c3bba9567b9c..53ef24a60f3d2371f37c0cc811c2eb4d7271d056 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -116,7 +116,7 @@
 #include "renderstate.h"
 #include "feedback.h"
 #include "referencecache.h"
-
+#include "texwindow.h"
 
 
 struct layout_globals_t
@@ -160,6 +160,15 @@ void VFS_Shutdown(){
        GlobalFileSystem().shutdown();
        g_vfsInitialized = false;
 }
+void VFS_Refresh(){
+       if ( !g_vfsInitialized ) return;
+       GlobalFileSystem().clear();
+       QE_InitVFS();
+       GlobalFileSystem().refresh();
+       g_vfsInitialized = true;
+       // also refresh texture browser
+       TextureBrowser_RefreshShaders();
+}
 void VFS_Restart(){
        VFS_Shutdown();
        VFS_Init();
@@ -955,11 +964,6 @@ void thunk_OnSleep(){
        g_pParentWnd->OnSleep();
 }
 
-void OpenUpdateURL(){
-       OpenURL( "https://gitlab.com/xonotic/netradiant/tags" );
-}
-
-// open the Q3Rad manual
 void OpenHelpURL(){
        OpenURL( "https://gitlab.com/xonotic/xonotic/wikis/Mapping" );
 }
@@ -1820,7 +1824,7 @@ GtkMenuItem* create_file_menu(){
        create_menu_item_with_mnemonic( menu, "_Import...", "ImportMap" );
        create_menu_item_with_mnemonic( menu, "_Save", "SaveMap" );
        create_menu_item_with_mnemonic( menu, "Save _as...", "SaveMapAs" );
-       create_menu_item_with_mnemonic( menu, "Save s_elected...", "SaveSelected" );
+       create_menu_item_with_mnemonic( menu, "_Export selected...", "ExportSelected" );
        menu_separator( menu );
        create_menu_item_with_mnemonic( menu, "Save re_gion...", "SaveRegion" );
        menu_separator( menu );
@@ -1832,7 +1836,6 @@ GtkMenuItem* create_file_menu(){
        menu_separator( menu );
        MRU_constructMenu( menu );
        menu_separator( menu );
-       create_menu_item_with_mnemonic( menu, "Check for NetRadiant update", "CheckForUpdate" ); // FIXME
        create_menu_item_with_mnemonic( menu, "E_xit", "Exit" );
 
        return file_menu_item;
@@ -3188,11 +3191,10 @@ void MainFrame_Construct(){
        GlobalCommands_insert( "ImportMap", FreeCaller<ImportMap>() );
        GlobalCommands_insert( "SaveMap", FreeCaller<SaveMap>(), Accelerator( 'S', (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "SaveMapAs", FreeCaller<SaveMapAs>() );
-       GlobalCommands_insert( "SaveSelected", FreeCaller<ExportMap>() );
+       GlobalCommands_insert( "ExportSelected", FreeCaller<ExportMap>() );
        GlobalCommands_insert( "SaveRegion", FreeCaller<SaveRegion>() );
        GlobalCommands_insert( "RefreshReferences", FreeCaller<RefreshReferences>() );
        GlobalCommands_insert( "ProjectSettings", FreeCaller<DoProjectSettings>() );
-       GlobalCommands_insert( "CheckForUpdate", FreeCaller<OpenUpdateURL>() );
        GlobalCommands_insert( "Exit", FreeCaller<Exit>() );
 
        GlobalCommands_insert( "Undo", FreeCaller<Undo>(), Accelerator( 'Z', (GdkModifierType)GDK_CONTROL_MASK ) );