marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

editor: Remove File/Save Game in favor of File/Save Game As 

Overwriting a non-savegame scenario with a savegame is too seldomly useful
to feature prominently in the menu.
Günther Brammer 2011-05-15 18:07:26 +02:00
parent 35a8667672
commit 8bb2afc477
7 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/editor/C4ConsoleGTK.cpp
View File

@ -131,7 +131,6 @@ public:
GtkWidget* fileOpenWithPlayers;
GtkWidget* fileSave;
GtkWidget* fileSaveAs;
GtkWidget* fileSaveGame;
GtkWidget* fileSaveGameAs;
GtkWidget* fileRecord;
GtkWidget* fileClose;
@ -207,7 +206,6 @@ public:
static void OnFileOpenWPlrs(GtkWidget* item, gpointer data);
static void OnFileSave(GtkWidget* item, gpointer data);
static void OnFileSaveAs(GtkWidget* item, gpointer data);
static void OnFileSaveGame(GtkWidget* item, gpointer data);
static void OnFileSaveGameAs(GtkWidget* item, gpointer data);
static void OnFileRecord(GtkWidget* item, gpointer data);
static void OnFileClose(GtkWidget* item, gpointer data);
@ -452,8 +450,6 @@ void C4ConsoleGUI::State::InitGUI()
fileSaveAs = gtk_menu_item_new_with_label(LoadResStr("IDS_MNU_SAVESCENARIOAS"));
gtk_menu_shell_append(GTK_MENU_SHELL(menuFile), fileSaveAs);
fileSaveGame = gtk_menu_item_new_with_label(LoadResStr("IDS_MNU_SAVEGAME"));
gtk_menu_shell_append(GTK_MENU_SHELL(menuFile), fileSaveGame);
fileSaveGameAs = gtk_menu_item_new_with_label(LoadResStr("IDS_MNU_SAVEGAMEAS"));
gtk_menu_shell_append(GTK_MENU_SHELL(menuFile), fileSaveGameAs);
@ -508,7 +504,6 @@ void C4ConsoleGUI::State::InitGUI()
g_signal_connect(G_OBJECT(fileOpenWithPlayers), "activate", G_CALLBACK(OnFileOpenWPlrs), this);
g_signal_connect(G_OBJECT(fileSave), "activate", G_CALLBACK(OnFileSave), this);
g_signal_connect(G_OBJECT(fileSaveAs), "activate", G_CALLBACK(OnFileSaveAs), this);
g_signal_connect(G_OBJECT(fileSaveGame), "activate", G_CALLBACK(OnFileSaveGame), this);
g_signal_connect(G_OBJECT(fileSaveGameAs), "activate", G_CALLBACK(OnFileSaveGameAs), this);
g_signal_connect(G_OBJECT(fileRecord), "activate", G_CALLBACK(OnFileRecord), this);
g_signal_connect(G_OBJECT(fileClose), "activate", G_CALLBACK(OnFileClose), this);
@ -541,7 +536,6 @@ void C4ConsoleGUI::State::Clear()
fileOpenWithPlayers = NULL;
fileSave = NULL;
fileSaveAs = NULL;
fileSaveGame = NULL;
fileSaveGameAs = NULL;
fileRecord = NULL;
fileClose = NULL;
@ -958,7 +952,6 @@ void C4ConsoleGUI::State::DoEnableControls(bool fEnable)
// File menu
// C4Network2 will have to handle that cases somehow (TODO: test)
gtk_widget_set_sensitive(fileRecord, Game.IsRunning && ::Control.IsRuntimeRecordPossible());
gtk_widget_set_sensitive(fileSaveGame, fEnable && ::Players.GetCount());
gtk_widget_set_sensitive(fileSaveGameAs, fEnable && ::Players.GetCount());
gtk_widget_set_sensitive(fileSave, fEnable);
gtk_widget_set_sensitive(fileSaveAs, fEnable);
@ -1537,11 +1530,6 @@ void C4ConsoleGUI::State::OnFileSaveAs(GtkWidget* item, gpointer data)
Console.FileSaveAs(false);
}
void C4ConsoleGUI::State::OnFileSaveGame(GtkWidget* item, gpointer data)
{
Console.FileSave(true);
}
void C4ConsoleGUI::State::OnFileSaveGameAs(GtkWidget* item, gpointer data)
{
Console.FileSaveAs(true);

4
src/editor/C4ConsoleWin32.cpp
View File

@ -160,7 +160,6 @@ public:
SetMenuItemText(hSubMenu,IDM_FILE_RECORD,LoadResStr("IDS_MNU_RECORD"));
SetMenuItemText(hSubMenu,IDM_FILE_SAVE,LoadResStr("IDS_MNU_SAVESCENARIO"));
SetMenuItemText(hSubMenu,IDM_FILE_SAVEAS,LoadResStr("IDS_MNU_SAVESCENARIOAS"));
SetMenuItemText(hSubMenu,IDM_FILE_SAVEGAME,LoadResStr("IDS_MNU_SAVEGAME"));
SetMenuItemText(hSubMenu,IDM_FILE_SAVEGAMEAS,LoadResStr("IDS_MNU_SAVEGAMEAS"));
SetMenuItemText(hSubMenu,IDM_FILE_CLOSE,LoadResStr("IDS_MNU_CLOSE"));
SetMenuItemText(hSubMenu,IDM_FILE_QUIT,LoadResStr("IDS_MNU_QUIT"));
@ -257,8 +256,6 @@ INT_PTR CALLBACK ConsoleDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lPara
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case IDM_FILE_SAVEGAMEAS: Console.FileSaveAs(true); return true;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case IDM_FILE_SAVEGAME: Console.FileSave(true); return true;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case IDM_FILE_OPEN: Console.FileOpen(); return true;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case IDM_FILE_RECORD: Console.FileRecord(); return true;
@ -677,7 +674,6 @@ void C4ConsoleGUI::DoEnableControls(bool fEnable)
EnableMenuItem(GetMenu(hWindow),IDM_FILE_OPEN, MF_BYCOMMAND | MF_ENABLED );
EnableMenuItem(GetMenu(hWindow),IDM_FILE_OPENWPLRS, MF_BYCOMMAND | MF_ENABLED );
EnableMenuItem(GetMenu(hWindow),IDM_FILE_RECORD, MF_BYCOMMAND | ((Game.IsRunning && ::Control.IsRuntimeRecordPossible()) ? MF_ENABLED : MF_GRAYED));
EnableMenuItem(GetMenu(hWindow),IDM_FILE_SAVEGAME, MF_BYCOMMAND | ((fEnable && ::Players.GetCount()) ? MF_ENABLED : MF_GRAYED));
EnableMenuItem(GetMenu(hWindow),IDM_FILE_SAVEGAMEAS, MF_BYCOMMAND | ((fEnable && ::Players.GetCount()) ? MF_ENABLED : MF_GRAYED));
EnableMenuItem(GetMenu(hWindow),IDM_FILE_SAVE, MF_BYCOMMAND | (fEnable ? MF_ENABLED : MF_GRAYED));
EnableMenuItem(GetMenu(hWindow),IDM_FILE_SAVEAS, MF_BYCOMMAND | (fEnable ? MF_ENABLED : MF_GRAYED));

1
src/platform/ClonkMainMenuActions.h
View File

@ -5,7 +5,6 @@
- (IBAction) openScenario:(id)sender;
- (IBAction) openScenarioWithPlayers:(id)sender;
- (IBAction) closeScenario:(id)sender;
- (IBAction) saveGame:(id)sender;
- (IBAction) saveGameAs:(id)sender;
- (IBAction) saveScenario:(id)sender;
- (IBAction) saveScenarioAs:(id)sender;

5
src/platform/ClonkMainMenuActions.mm
View File

@ -44,10 +44,6 @@
[consoleController.window setRepresentedFilename:@""];
}
- (IBAction) saveGame:(id)sender
{
Console.FileSave(true);
}
- (IBAction) saveGameAs:(id)sender
{
@ -165,7 +161,6 @@
{
@selector(saveScenario:),
@selector(saveScenarioAs:),
@selector(saveGame:),
@selector(saveGameAs:),
@selector(record:),
@selector(closeScenario:),

8
src/res/MainMenu.xib
View File

@ -1113,14 +1113,6 @@
</object>
<int key="connectionID">529</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">saveGame:</string>
<reference key="source" ref="898186092"/>
<reference key="destination" ref="544691877"/>
</object>
<int key="connectionID">530</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">saveGameAs:</string>

1
src/res/engine.rc
View File

@ -303,7 +303,6 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "SAVESCENARIO", IDM_FILE_SAVE
MENUITEM "SAVESCENARIOAS", IDM_FILE_SAVEAS
MENUITEM "SAVEGAME", IDM_FILE_SAVEGAME
MENUITEM "SAVEGAME AS", IDM_FILE_SAVEGAMEAS
MENUITEM "RECORD", IDM_FILE_RECORD
MENUITEM SEPARATOR

1
src/res/resource.h
View File

@ -76,7 +76,6 @@
#define IDM_FILE_QUIT 5006
#define IDM_FILE_SAVE 5007
#define IDM_FILE_SAVEAS 5008
#define IDM_FILE_SAVEGAME 5009
#define IDM_FILE_SAVEGAMEAS 5010
#define IDM_HELP_ABOUT 5011
#define IDM_PLAYER_JOIN 5012