From 39c73905b9eddeb4da96c1357643e78915863cde Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Mon, 2 Jan 2012 20:45:49 -0500
Subject: [PATCH] desktop: internal rename of "device switch" to "migrate
 device"

---
 desktop/images/Makefile.am                                  |   6 +++---
 .../{deviceswitch-focus.png => migratedevice-focus.png}     | Bin
 .../{deviceswitch-normal.png => migratedevice-normal.png}   | Bin
 .../{deviceswitch-pushed.png => migratedevice-pushed.png}   | Bin
 desktop/src/BaseFrame.cc                                    |   4 ++--
 desktop/src/BaseFrame.h                                     |   2 +-
 desktop/src/util.cc                                         |   4 ++--
 desktop/src/windowids.h                                     |   2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename desktop/images/{deviceswitch-focus.png => migratedevice-focus.png} (100%)
 rename desktop/images/{deviceswitch-normal.png => migratedevice-normal.png} (100%)
 rename desktop/images/{deviceswitch-pushed.png => migratedevice-pushed.png} (100%)

diff --git a/desktop/images/Makefile.am b/desktop/images/Makefile.am
index af3e2730..6e3b8f50 100644
--- a/desktop/images/Makefile.am
+++ b/desktop/images/Makefile.am
@@ -10,9 +10,9 @@ dist_image_DATA = \
 	browsedatabases-focus.png \
 	browsedatabases-normal.png \
 	browsedatabases-pushed.png \
-	deviceswitch-focus.png \
-	deviceswitch-normal.png \
-	deviceswitch-pushed.png \
+	migratedevice-focus.png \
+	migratedevice-normal.png \
+	migratedevice-pushed.png \
 	media-focus.png \
 	media-normal.png \
 	media-pushed.png \
diff --git a/desktop/images/deviceswitch-focus.png b/desktop/images/migratedevice-focus.png
similarity index 100%
rename from desktop/images/deviceswitch-focus.png
rename to desktop/images/migratedevice-focus.png
diff --git a/desktop/images/deviceswitch-normal.png b/desktop/images/migratedevice-normal.png
similarity index 100%
rename from desktop/images/deviceswitch-normal.png
rename to desktop/images/migratedevice-normal.png
diff --git a/desktop/images/deviceswitch-pushed.png b/desktop/images/migratedevice-pushed.png
similarity index 100%
rename from desktop/images/deviceswitch-pushed.png
rename to desktop/images/migratedevice-pushed.png
diff --git a/desktop/src/BaseFrame.cc b/desktop/src/BaseFrame.cc
index ad2a117a..bb028297 100644
--- a/desktop/src/BaseFrame.cc
+++ b/desktop/src/BaseFrame.cc
@@ -46,7 +46,7 @@ BEGIN_EVENT_TABLE(BaseFrame, wxFrame)
 	EVT_BUTTON	(MainMenu_Sync, BaseFrame::OnSync)
 	EVT_BUTTON	(MainMenu_Modem, BaseFrame::OnModem)
 	EVT_BUTTON	(MainMenu_AppLoader, BaseFrame::OnAppLoader)
-	EVT_BUTTON	(MainMenu_DeviceSwitch, BaseFrame::OnDeviceSwitch)
+	EVT_BUTTON	(MainMenu_MigrateDevice, BaseFrame::OnMigrateDevice)
 	EVT_BUTTON	(MainMenu_BrowseDatabases, BaseFrame::OnBrowseDatabases)
 	EVT_BUTTON	(MainMenu_MediaManagement, BaseFrame::OnMediaManagement)
 	EVT_BUTTON	(MainMenu_Misc, BaseFrame::OnMisc)
@@ -680,7 +680,7 @@ void BaseFrame::OnAppLoader(wxCommandEvent &event)
 */
 }
 
-void BaseFrame::OnDeviceSwitch(wxCommandEvent &event)
+void BaseFrame::OnMigrateDevice(wxCommandEvent &event)
 {
 }
 
diff --git a/desktop/src/BaseFrame.h b/desktop/src/BaseFrame.h
index b910ae33..6b070bab 100644
--- a/desktop/src/BaseFrame.h
+++ b/desktop/src/BaseFrame.h
@@ -77,7 +77,7 @@ public:
 	void OnSync(wxCommandEvent &event);
 	void OnModem(wxCommandEvent &event);
 	void OnAppLoader(wxCommandEvent &event);
-	void OnDeviceSwitch(wxCommandEvent &event);
+	void OnMigrateDevice(wxCommandEvent &event);
 	void OnBrowseDatabases(wxCommandEvent &event);
 	void OnMediaManagement(wxCommandEvent &event);
 	void OnMisc(wxCommandEvent &event);
diff --git a/desktop/src/util.cc b/desktop/src/util.cc
index faeb4002..be20b47a 100644
--- a/desktop/src/util.cc
+++ b/desktop/src/util.cc
@@ -28,7 +28,7 @@ const wxChar *ButtonNames[] = {
 	_T("sync"),
 	_T("modem"),
 	_T("apploader"),
-	_T("deviceswitch"),
+	_T("migratedevice"),
 	_T("browsedatabases"),
 	_T("media"),
 	_T("misc"),
@@ -40,7 +40,7 @@ bool ButtonEnabled[] = {
 	true,	// sync
 	false,	// modem
 	false,	// apploader
-	false,	// deviceswitch
+	false,	// migratedevice
 	true,	// browsedatabases
 	false,	// media
 	false,	// misc
diff --git a/desktop/src/windowids.h b/desktop/src/windowids.h
index e2dd9c48..754f4884 100644
--- a/desktop/src/windowids.h
+++ b/desktop/src/windowids.h
@@ -36,7 +36,7 @@ enum {
 	MainMenu_Sync,
 	MainMenu_Modem,
 	MainMenu_AppLoader,
-	MainMenu_DeviceSwitch,
+	MainMenu_MigrateDevice,
 	MainMenu_BrowseDatabases,
 	MainMenu_MediaManagement,
 	MainMenu_Misc,
-- 
2.11.4.GIT