Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Rebranding, use preferences icon for 'Settings' submenu.

  • Loading branch information...
commit 1c443d9c89aa183e693f84a1655c47500d0ef3d3 1 parent b6c9ea5
Mitchell Cooper authored April 07, 2012
6  src/fe-gtk/maingui.c
@@ -2504,10 +2504,10 @@ mg_create_topwindow (session *sess)
2504 2504
 	GtkWidget *table;
2505 2505
 
2506 2506
 	if (sess->type == SESS_DIALOG)
2507  
-		win = gtkutil_window_new ("conspire", NULL,
  2507
+		win = gtkutil_window_new (DISPLAY_NAME, NULL,
2508 2508
 										  prefs.dialog_width, prefs.dialog_height, 0);
2509 2509
 	else
2510  
-		win = gtkutil_window_new ("conspire", NULL,
  2510
+		win = gtkutil_window_new (DISPLAY_NAME, NULL,
2511 2511
 										  prefs.mainwindow_width,
2512 2512
 										  prefs.mainwindow_height, 0);
2513 2513
 
@@ -2608,7 +2608,7 @@ mg_create_tabwindow (session *sess)
2608 2608
 	GtkWidget *win;
2609 2609
 	GtkWidget *table;
2610 2610
 
2611  
-	win = gtkutil_window_new ("conspire", NULL, prefs.mainwindow_width,
  2611
+	win = gtkutil_window_new (DISPLAY_NAME, NULL, prefs.mainwindow_width,
2612 2612
 									  prefs.mainwindow_height, 0);
2613 2613
 
2614 2614
 	sess->gui->window = win;
22  src/fe-gtk/menu.c
@@ -873,7 +873,7 @@ menu_settings (GtkWidget * wid, gpointer none)
873 873
 static void
874 874
 menu_usermenu (void)
875 875
 {
876  
-	editlist_gui_open (NULL, NULL, usermenu_list, _("conspire: User menu"),
  876
+	editlist_gui_open (NULL, NULL, usermenu_list, _(DISPLAY_NAME ": User menu"),
877 877
 							 "usermenu", "usermenu.conf", 0);
878 878
 }
879 879
 
@@ -1129,21 +1129,21 @@ menu_pluginlist (void)
1129 1129
 static void
1130 1130
 menu_usercommands (void)
1131 1131
 {
1132  
-	editlist_gui_open (NULL, NULL, command_list, _("conspire: User Defined Commands"),
  1132
+	editlist_gui_open (NULL, NULL, command_list, _(DISPLAY_NAME ": User Defined Commands"),
1133 1133
 							 "commands", "commands.conf", usercommands_help);
1134 1134
 }
1135 1135
 
1136 1136
 static void
1137 1137
 menu_ulpopup (void)
1138 1138
 {
1139  
-	editlist_gui_open (NULL, NULL, popup_list, _("conspire: Userlist Popup menu"), "popup",
  1139
+	editlist_gui_open (NULL, NULL, popup_list, _(DISPLAY_NAME ": Userlist Popup menu"), "popup",
1140 1140
 							 "popup.conf", ulbutton_help);
1141 1141
 }
1142 1142
 
1143 1143
 static void
1144 1144
 menu_rpopup (void)
1145 1145
 {
1146  
-	editlist_gui_open (_("Text"), _("Replace with"), replace_list, _("conspire: Replace"), "replace",
  1146
+	editlist_gui_open (_("Text"), _("Replace with"), replace_list, _(DISPLAY_NAME ": Replace"), "replace",
1147 1147
 							 "replace.conf", 0);
1148 1148
 }
1149 1149
 
@@ -1151,7 +1151,7 @@ menu_rpopup (void)
1151 1151
 static void
1152 1152
 menu_regex (void)
1153 1153
 {
1154  
-	editlist_gui_open (_("Search for"), _("Replace with"), regex_replace_list, _("conspire: Regex Replace"), "regex_replace",
  1154
+	editlist_gui_open (_("Search for"), _("Replace with"), regex_replace_list, _(DISPLAY_NAME ": Regex Replace"), "regex_replace",
1155 1155
 			"regex_replace.conf", 0);
1156 1156
 }
1157 1157
 #endif
@@ -1159,7 +1159,7 @@ menu_regex (void)
1159 1159
 static void
1160 1160
 menu_urlhandlers (void)
1161 1161
 {
1162  
-	editlist_gui_open (NULL, NULL, urlhandler_list, _("conspire: URL Handlers"), "urlhandlers",
  1162
+	editlist_gui_open (NULL, NULL, urlhandler_list, _(DISPLAY_NAME ": URL Handlers"), "urlhandlers",
1163 1163
 							 "urlhandlers.conf", url_help);
1164 1164
 }
1165 1165
 
@@ -1178,21 +1178,21 @@ menu_keypopup (void)
1178 1178
 static void
1179 1179
 menu_ulbuttons (void)
1180 1180
 {
1181  
-	editlist_gui_open (NULL, NULL, button_list, _("conspire: Userlist buttons"), "buttons",
  1181
+	editlist_gui_open (NULL, NULL, button_list, _(DISPLAY_NAME ": Userlist buttons"), "buttons",
1182 1182
 							 "buttons.conf", ulbutton_help);
1183 1183
 }
1184 1184
 
1185 1185
 static void
1186 1186
 menu_dlgbuttons (void)
1187 1187
 {
1188  
-	editlist_gui_open (NULL, NULL, dlgbutton_list, _("conspire: Dialog buttons"), "dlgbuttons",
  1188
+	editlist_gui_open (NULL, NULL, dlgbutton_list, _(DISPLAY_NAME ": Dialog buttons"), "dlgbuttons",
1189 1189
 							 "dlgbuttons.conf", dlgbutton_help);
1190 1190
 }
1191 1191
 
1192 1192
 static void
1193 1193
 menu_ctcpguiopen (void)
1194 1194
 {
1195  
-	editlist_gui_open (NULL, NULL, ctcp_list, _("conspire: CTCP Replies"), "ctcpreply",
  1195
+	editlist_gui_open (NULL, NULL, ctcp_list, _(DISPLAY_NAME ": CTCP Replies"), "ctcpreply",
1196 1196
 							 "ctcpreply.conf", ctcp_help);
1197 1197
 }
1198 1198
 
@@ -1274,7 +1274,7 @@ menu_metres_both (GtkWidget *item, gpointer none)
1274 1274
 static struct mymenu mymenu[] = {
1275 1275
 // Change the name on OS X
1276 1276
 #ifndef GDK_WINDOWING_QUARTZ
1277  
-	{N_("_Conspire"), 0, 0, M_NEWMENU, 0, 0, 1},
  1277
+	{N_("_" DISPLAY_NAME), 0, 0, M_NEWMENU, 0, 0, 1},
1278 1278
 #else
1279 1279
 	{N_("File"), 0, 0, M_NEWMENU, 0, 0, 1},	
1280 1280
 #endif
@@ -1296,7 +1296,7 @@ static struct mymenu mymenu[] = {
1296 1296
 #endif
1297 1297
 	{0, 0, 0, M_SEP, 0, 0, 0},	/* 11 */
1298 1298
 
1299  
-	{N_("S_ettings"), 0, 0, M_MENUSUB, 0, 0, 1},
  1299
+	{N_("S_ettings"), 0, GTK_STOCK_PREFERENCES, M_MENUSUB, 0, 0, 1},
1300 1300
 		{N_("_Preferences"), menu_settings, GTK_STOCK_PREFERENCES, M_MENUSTOCK, 0, 0, 1},
1301 1301
 		{N_("Auto Replace..."), menu_rpopup, 0, M_MENUITEM, 0, 0, 1},
1302 1302
 #ifdef REGEX_SUBSTITUTION

0 notes on commit 1c443d9

Please sign in to comment.
Something went wrong with that request. Please try again.