[Scummvm-cvs-logs] CVS: scummvm/backends/wince CELauncherDialog.cpp,1.4,1.5
Nicolas Bacca
arisme at users.sourceforge.net
Sun May 9 07:50:01 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince/CEgui CEGUI.h,1.2,1.3 ItemSwitch.h,1.2,1.3 PanelKeyboard.cpp,1.2,1.3 PanelKeyboard.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince CEScaler.cpp,1.5,1.6 CEScaler.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27571
Modified Files:
CELauncherDialog.cpp
Log Message:
Add warning for unresolved conflicts
Index: CELauncherDialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CELauncherDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CELauncherDialog.cpp 17 Mar 2004 00:07:43 -0000 1.4
+++ CELauncherDialog.cpp 9 May 2004 14:48:59 -0000 1.5
@@ -56,6 +56,20 @@
}
};
+class CEConflictDialog : public Dialog {
+public:
+ CEConflictDialog::CEConflictDialog(const Common::String &name)
+ : Dialog(10, 60, 300, 77) {
+
+ addButton((_w - kButtonWidth) / 2, 45, "OK", kCloseCmd, '\r'); // Close dialog - FIXME
+
+ Common::String conflict("Too many matches for directory ");
+ conflict += name;
+ new StaticTextWidget(this, 0, 10, _w, kLineHeight, conflict, kTextAlignCenter);
+ new StaticTextWidget(this, 0, 20, _w, kLineHeight, "Please fix this :)", kTextAlignCenter);
+ }
+};
+
CELauncherDialog::CELauncherDialog(GameDetector &detector) : GUI::LauncherDialog(detector) {
}
@@ -87,8 +101,12 @@
if (scumm_stricmp(candidateName, candidates[i].name) == 0) {
idx = i;
break;
+ }
+ }
+ if (idx == -1) {
+ CEConflictDialog conflict(candidateName);
+ conflict.runModal();
}
- }
}
if (idx < 0)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince/CEgui CEGUI.h,1.2,1.3 ItemSwitch.h,1.2,1.3 PanelKeyboard.cpp,1.2,1.3 PanelKeyboard.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince CEScaler.cpp,1.5,1.6 CEScaler.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list