aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorsimonb <simonb>2006-05-20 15:08:14 (GMT)
committersimonb <simonb>2006-05-20 15:08:14 (GMT)
commit0861f3a9073ccd016302af26ff992fa19331a02d (patch)
treef1a2276449a5fc9b27f2d1afa5ffff4410141345 /src/fluxbox.cc
parent5ddabb0f390f69db793b5a6e40be9f94b8f83136 (diff)
downloadfluxbox_pavel-0861f3a9073ccd016302af26ff992fa19331a02d.zip
fluxbox_pavel-0861f3a9073ccd016302af26ff992fa19331a02d.tar.bz2
improve native language handling, move messages and menu labels to
FbTk::FbString
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index fd50392..70c5993 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -234,12 +234,12 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
234 234
235 _FB_USES_NLS; 235 _FB_USES_NLS;
236 if (s_singleton != 0) 236 if (s_singleton != 0)
237 throw string(_FBTEXT(Fluxbox, FatalSingleton, "Fatal! There can only one instance of fluxbox class.", "Error displayed on weird error where an instance of the Fluxbox class already exists!")); 237 throw _FBTEXT(Fluxbox, FatalSingleton, "Fatal! There can only one instance of fluxbox class.", "Error displayed on weird error where an instance of the Fluxbox class already exists!");
238 238
239 if (display() == 0) { 239 if (display() == 0) {
240 throw string(_FBTEXT(Fluxbox, NoDisplay, 240 throw _FBTEXT(Fluxbox, NoDisplay,
241 "Can not connect to X server.\nMake sure you started X before you start Fluxbox.", 241 "Can not connect to X server.\nMake sure you started X before you start Fluxbox.",
242 "Error message when no X display appears to exist")); 242 "Error message when no X display appears to exist");
243 } 243 }
244 244
245 Display *disp = FbTk::App::instance()->display(); 245 Display *disp = FbTk::App::instance()->display();
@@ -367,9 +367,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
367 367
368 368
369 if (m_screen_list.empty()) { 369 if (m_screen_list.empty()) {
370 throw string(_FBTEXT(Fluxbox, ErrorNoScreens, 370 throw _FBTEXT(Fluxbox, ErrorNoScreens,
371 "Couldn't find screens to manage.\nMake sure you don't have another window manager running.", 371 "Couldn't find screens to manage.\nMake sure you don't have another window manager running.",
372 "Error message when no unmanaged screens found - usually means another window manager is running")); 372 "Error message when no unmanaged screens found - usually means another window manager is running");
373 } 373 }
374 374
375 m_keyscreen = m_mousescreen = m_screen_list.front(); 375 m_keyscreen = m_mousescreen = m_screen_list.front();
@@ -596,7 +596,7 @@ void Fluxbox::setupConfigFiles() {
596 if (mkdir(dirname.c_str(), 0700)) { 596 if (mkdir(dirname.c_str(), 0700)) {
597 fprintf(stderr, _FBTEXT(Fluxbox, ErrorCreatingDirectory, 597 fprintf(stderr, _FBTEXT(Fluxbox, ErrorCreatingDirectory,
598 "Can't create %s directory", 598 "Can't create %s directory",
599 "Can't create a directory, one %s for directory name"), 599 "Can't create a directory, one %s for directory name").c_str(),
600 dirname.c_str()); 600 dirname.c_str());
601 cerr<<endl; 601 cerr<<endl;
602 return; 602 return;
@@ -1156,19 +1156,17 @@ void Fluxbox::handleSignal(int signum) {
1156 break; 1156 break;
1157 default: 1157 default:
1158 fprintf(stderr, 1158 fprintf(stderr,
1159 _FBTEXT(BaseDisplay, SignalCaught, "%s: signal %d caught\n", "signal catch debug message. Include %s for command and %d for signal number"), 1159 _FBTEXT(BaseDisplay, SignalCaught, "%s: signal %d caught\n", "signal catch debug message. Include %s for command and %d for signal number").c_str(),
1160 m_argv[0], signum); 1160 m_argv[0], signum);
1161 1161
1162 if (! m_starting && ! re_enter) { 1162 if (! m_starting && ! re_enter) {
1163 re_enter = 1; 1163 re_enter = 1;
1164 fprintf(stderr, 1164 cerr<<_FBTEXT(BaseDisplay, ShuttingDown, "Shutting Down\n", "Quitting because of signal, end with newline");
1165 _FBTEXT(BaseDisplay, ShuttingDown, "Shutting Down\n", "Quitting because of signal, end with newline"));
1166 shutdown(); 1165 shutdown();
1167 } 1166 }
1168 1167
1169 1168
1170 fprintf(stderr, 1169 cerr<<_FBTEXT(BaseDisplay, Aborting, "Aborting... dumping core\n", "Aboring and dumping core, end with newline");
1171 _FBTEXT(BaseDisplay, Aborting, "Aborting... dumping core\n", "Aboring and dumping core, end with newline"));
1172 abort(); 1170 abort();
1173 break; 1171 break;
1174 } 1172 }