Merge commit 'ce0ea4bdc1521a3926994077fc104e7a155d299d' into master-merge

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

diff --git a/radiant/mru.cpp b/radiant/mru.cpp
index 640fd3914ca94e1f3f9ec7a77d3f9c5e9c1d66af..709876482dd4621afbfab24bf0dd034912b3cbcf 100644 (file)
--- a/radiant/mru.cpp
+++ b/radiant/mru.cpp
@@ -33,14 +33,14 @@
 #include "map.h"
 #include "qe3.h"
 
-const int MRU_MAX = 4;
+#define MRU_MAX 9
 namespace {
-       GtkMenuItem *MRU_items[MRU_MAX];
-       std::size_t MRU_used;
-       typedef CopiedString MRU_filename_t;
-       MRU_filename_t MRU_filenames[MRU_MAX];
-       typedef const char* MRU_key_t;
-       MRU_key_t MRU_keys[MRU_MAX] = { "File0", "File1", "File2", "File3" };
+GtkMenuItem *MRU_items[MRU_MAX];
+std::size_t MRU_used;
+typedef CopiedString MRU_filename_t;
+MRU_filename_t MRU_filenames[MRU_MAX];
+typedef const char* MRU_key_t;
+MRU_key_t MRU_keys[MRU_MAX] = { "File0", "File1", "File2", "File3", "File4", "File5", "File6", "File7", "File8" };
 }
 
 inline const char* MRU_GetText( std::size_t index ){
@@ -54,25 +54,25 @@ private:
 
 public:
        EscapedMnemonic() : m_buffer(){
-               m_buffer.push_back( '_' );
-       }
-       const char* c_str() const {
-               return m_buffer.c_str();
-       }
-       void push_back( char c ){ // not escaped
-               m_buffer.push_back( c );
-       }
-       std::size_t write( const char* buffer, std::size_t length ){
-               for ( const char* end = buffer + length; buffer != end; ++buffer )
-               {
-                       if ( *buffer == '_' ) {
-                               m_buffer.push_back( '_' );
-                       }
-
-                       m_buffer.push_back( *buffer );
+       m_buffer.push_back( '_' );
+}
+const char* c_str() const {
+       return m_buffer.c_str();
+}
+void push_back( char c ){ // not escaped
+       m_buffer.push_back( c );
+}
+std::size_t write( const char* buffer, std::size_t length ){
+       for ( const char* end = buffer + length; buffer != end; ++buffer )
+       {
+               if ( *buffer == '_' ) {
+                       m_buffer.push_back( '_' );
                }
-               return length;
+
+               m_buffer.push_back( *buffer );
        }
+       return length;
+}
 };
 
 template<typename T>
@@ -175,17 +175,17 @@ void MRU_Activate( std::size_t index ){
 class LoadMRU
 {
 private:
-       std::size_t m_number;
+std::size_t m_number;
 
 public:
-       LoadMRU( std::size_t number )
-               : m_number( number ){
-       }
-       void load(){
-               if ( ConfirmModified( "Open Map" ) ) {
-                       MRU_Activate( m_number - 1 );
-               }
+LoadMRU( std::size_t number )
+       : m_number( number ){
+}
+void load(){
+       if ( ConfirmModified( "Open Map" ) ) {
+               MRU_Activate( m_number - 1 );
        }
+}
 };
 
 typedef MemberCaller<LoadMRU, void(), &LoadMRU::load> LoadMRUCaller;
@@ -194,6 +194,11 @@ LoadMRU g_load_mru1( 1 );
 LoadMRU g_load_mru2( 2 );
 LoadMRU g_load_mru3( 3 );
 LoadMRU g_load_mru4( 4 );
+LoadMRU g_load_mru5( 5 );
+LoadMRU g_load_mru6( 6 );
+LoadMRU g_load_mru7( 7 );
+LoadMRU g_load_mru8( 8 );
+LoadMRU g_load_mru9( 9 );
 
 void MRU_constructMenu( ui::Menu menu ){
        {
@@ -216,6 +221,31 @@ void MRU_constructMenu( ui::Menu menu ){
                item.hide();
                MRU_AddWidget( item, 3 );
        }
+       {
+               auto item = create_menu_item_with_mnemonic( menu, "_5", LoadMRUCaller( g_load_mru5 ) );
+               item.hide();
+               MRU_AddWidget( item, 3 );
+       }
+       {
+               auto item = create_menu_item_with_mnemonic( menu, "_6", LoadMRUCaller( g_load_mru6 ) );
+               item.hide();
+               MRU_AddWidget( item, 3 );
+       }
+       {
+               auto item = create_menu_item_with_mnemonic( menu, "_7", LoadMRUCaller( g_load_mru7 ) );
+               item.hide();
+               MRU_AddWidget( item, 3 );
+       }
+       {
+               auto item = create_menu_item_with_mnemonic( menu, "_8", LoadMRUCaller( g_load_mru8 ) );
+               item.hide();
+               MRU_AddWidget( item, 3 );
+       }
+       {
+               auto item = create_menu_item_with_mnemonic( menu, "_9", LoadMRUCaller( g_load_mru9 ) );
+               item.hide();
+               MRU_AddWidget( item, 3 );
+       }
 }
 
 #include "preferencesystem.h"