i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* proper check for the what field to show the config window

Browse Source 
* if there are printers but no default one, show only the printer panel without the add dialog
* adjusted the alert message accordingly


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24516 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Karsten Heimrich
2008-03-22 00:20:26 +00:00
parent 76f2895ed9
commit 77258c7702
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/print/PrintServerApp.R5.cpp
+21 -10
View File
@@ -26,7 +26,7 @@ struct AsyncThreadParams {
: app(app) : app(app)
, printer(p) , printer(p)
, message(m) , message(m)
{ {
app->Acquire(); app->Acquire();
if (printer) printer->Acquire(); if (printer) printer->Acquire();
} }
@@ -36,8 +36,8 @@ struct AsyncThreadParams {
delete message; delete message;
app->Release(); app->Release();
} }
BMessage* AcquireMessage() { BMessage* AcquireMessage() {
BMessage* m = message; message = NULL; return m; BMessage* m = message; message = NULL; return m;
} }
}; };
@@ -56,8 +56,11 @@ status_t PrintServerApp::async_thread(void* data)
case PSRV_SHOW_PRINT_SETUP: case PSRV_SHOW_PRINT_SETUP:
if (printer) { if (printer) {
if (p->app->fUseConfigWindow) { if (p->app->fUseConfigWindow) {
ConfigWindow* w = new ConfigWindow(PSRV_SHOW_PAGE_SETUP config_setup_kind kind = kJobSetup;
? kPageSetup : kJobSetup, printer, msg, &sender); if (msg->what == PSRV_SHOW_PAGE_SETUP)
kind = kPageSetup;
ConfigWindow* w = new ConfigWindow(kind, printer, msg,
&sender);
w->Go(); w->Go();
} else { } else {
BMessage reply(*msg); BMessage reply(*msg);
@@ -67,10 +70,17 @@ status_t PrintServerApp::async_thread(void* data)
} else { } else {
// If no default printer is set, give user // If no default printer is set, give user
// choice of aborting or setting up a printer // choice of aborting or setting up a printer
BAlert* alert = new BAlert("Info", "There are no printers " int32 count = Printer::CountPrinters();
"set up. Would you set one up now?", "No", "Yes"); BString alertText("There are no printers set up. ");
if (alert->Go() == 1) if (count > 0)
alertText.SetTo("There is no default printer set up. ");
BAlert* alert = new BAlert("Info", alertText.Append("Would "
"you like to set one up now?").String(), "No", "Yes");
if (alert->Go() == 1 && count == 0)
run_add_printer_panel(); run_add_printer_panel();
else
run_select_printer_panel();
} }
} break; } break;
@@ -127,7 +137,7 @@ void PrintServerApp::AsyncHandleMessage(BMessage* msg)
thread_id tid = spawn_thread(async_thread, "async", B_NORMAL_PRIORITY, (void*)data); thread_id tid = spawn_thread(async_thread, "async", B_NORMAL_PRIORITY, (void*)data);
if (tid > 0) { if (tid > 0) {
resume_thread(tid); resume_thread(tid);
} else { } else {
delete data; delete data;
} }
@@ -150,7 +160,8 @@ void PrintServerApp::Handle_BeOSR5_Message(BMessage* msg)
} }
} }
reply.AddString("printer_name", printerName); reply.AddString("printer_name", printerName);
reply.AddInt32("color", BPrintJob::B_COLOR_PRINTER); // BeOS knows not if color or not, so always color // BeOS knows not if color or not, so always color
reply.AddInt32("color", BPrintJob::B_COLOR_PRINTER);
msg->SendReply(&reply); msg->SendReply(&reply);
} }
break; break;