Some style fixes.
This commit is contained in:
parent
8cd10c710f
commit
1797be0dc6
|
@ -29,14 +29,16 @@
|
|||
#include <SupportDefs.h>
|
||||
|
||||
|
||||
SpoolFolder::SpoolFolder(BLocker*locker, BLooper* looper, const BDirectory& spoolDir)
|
||||
SpoolFolder::SpoolFolder(BLocker* locker, BLooper* looper,
|
||||
const BDirectory& spoolDir)
|
||||
: Folder(locker, looper, spoolDir)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
// Notify print_server that there is a job file waiting for printing
|
||||
void SpoolFolder::Notify(Job* job, int kind)
|
||||
void
|
||||
SpoolFolder::Notify(Job* job, int kind)
|
||||
{
|
||||
if ((kind == kJobAdded || kind == kJobAttrChanged)
|
||||
&& job->IsValid() && job->IsWaiting()) {
|
||||
|
@ -61,10 +63,11 @@ BObjectList<Printer> Printer::sPrinters;
|
|||
// Returns:
|
||||
// Pointer to Printer object, or NULL if not found.
|
||||
// ---------------------------------------------------------------
|
||||
Printer* Printer::Find(const BString& name)
|
||||
Printer*
|
||||
Printer::Find(const BString& name)
|
||||
{
|
||||
// Look in list to find printer definition
|
||||
for (int32 idx=0; idx < sPrinters.CountItems(); idx++) {
|
||||
// Look in list to find printer definition
|
||||
for (int32 idx = 0; idx < sPrinters.CountItems(); idx++) {
|
||||
if (name == sPrinters.ItemAt(idx)->Name())
|
||||
return sPrinters.ItemAt(idx);
|
||||
}
|
||||
|
@ -72,10 +75,11 @@ Printer* Printer::Find(const BString& name)
|
|||
}
|
||||
|
||||
|
||||
Printer* Printer::Find(node_ref* node)
|
||||
Printer*
|
||||
Printer::Find(node_ref* node)
|
||||
{
|
||||
node_ref n;
|
||||
// Look in list to find printer definition
|
||||
// Look in list to find printer definition
|
||||
for (int32 idx = 0; idx < sPrinters.CountItems(); idx++) {
|
||||
Printer* printer = sPrinters.ItemAt(idx);
|
||||
printer->SpoolDir()->GetNodeRef(&n);
|
||||
|
@ -83,23 +87,27 @@ Printer* Printer::Find(node_ref* node)
|
|||
return printer;
|
||||
}
|
||||
|
||||
// None found, so return NULL
|
||||
// None found, so return NULL
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
Printer* Printer::At(int32 idx)
|
||||
Printer*
|
||||
Printer::At(int32 idx)
|
||||
{
|
||||
return sPrinters.ItemAt(idx);
|
||||
}
|
||||
|
||||
|
||||
void Printer::Remove(Printer* printer)
|
||||
void
|
||||
Printer::Remove(Printer* printer)
|
||||
{
|
||||
sPrinters.RemoveItem(printer);
|
||||
}
|
||||
|
||||
int32 Printer::CountPrinters()
|
||||
|
||||
int32
|
||||
Printer::CountPrinters()
|
||||
{
|
||||
return sPrinters.CountItems();
|
||||
}
|
||||
|
@ -144,7 +152,8 @@ Printer::~Printer()
|
|||
}
|
||||
|
||||
|
||||
void Printer::MessageReceived(BMessage* msg)
|
||||
void
|
||||
Printer::MessageReceived(BMessage* msg)
|
||||
{
|
||||
switch(msg->what) {
|
||||
case B_GET_PROPERTY:
|
||||
|
@ -163,12 +172,13 @@ void Printer::MessageReceived(BMessage* msg)
|
|||
|
||||
|
||||
// Remove printer spooler directory
|
||||
status_t Printer::Remove()
|
||||
status_t
|
||||
Printer::Remove()
|
||||
{
|
||||
status_t rc = B_OK;
|
||||
BPath path;
|
||||
|
||||
if ((rc=::find_directory(B_USER_PRINTERS_DIRECTORY, &path)) == B_OK) {
|
||||
if ((rc = ::find_directory(B_USER_PRINTERS_DIRECTORY, &path)) == B_OK) {
|
||||
path.Append(Name());
|
||||
rc = rmdir(path.Path());
|
||||
}
|
||||
|
@ -196,7 +206,8 @@ Printer::FindPathToDriver(const char* driverName, BPath* path)
|
|||
// Returns:
|
||||
// B_OK if successful or errorcode otherwise.
|
||||
// ---------------------------------------------------------------
|
||||
status_t Printer::ConfigurePrinter(const char* driverName,
|
||||
status_t
|
||||
Printer::ConfigurePrinter(const char* driverName,
|
||||
const char* printerName)
|
||||
{
|
||||
PrintAddOnServer addOn(driverName);
|
||||
|
@ -257,9 +268,9 @@ Printer::ConfigureJob(BMessage& settings)
|
|||
|
||||
PrintAddOnServer addOn(driver.String());
|
||||
result = addOn.ConfigJob(SpoolDir(), &settings);
|
||||
if (result == B_OK) {
|
||||
if (result == B_OK)
|
||||
AddCurrentPrinter(settings);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -301,9 +312,9 @@ Printer::GetDefaultSettings(BMessage& settings)
|
|||
|
||||
PrintAddOnServer addOn(driver.String());
|
||||
result = addOn.DefaultSettings(SpoolDir(), &settings);
|
||||
if (result == B_OK) {
|
||||
if (result == B_OK)
|
||||
AddCurrentPrinter(settings);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
|
@ -15,23 +15,27 @@
|
|||
AppSettings::AppSettings(const char* mimetype, const char* printer)
|
||||
: fMimeType(mimetype)
|
||||
{
|
||||
if (printer) fPrinter = printer;
|
||||
if (printer != NULL)
|
||||
fPrinter = printer;
|
||||
}
|
||||
|
||||
|
||||
// Implementation of PrinterSettings
|
||||
|
||||
PrinterSettings::PrinterSettings(const char* printer, BMessage* pageSettings, BMessage* jobSettings)
|
||||
PrinterSettings::PrinterSettings(const char* printer,
|
||||
BMessage* pageSettings, BMessage* jobSettings)
|
||||
: fPrinter(printer)
|
||||
{
|
||||
if (pageSettings) fPageSettings = *pageSettings;
|
||||
if (jobSettings) fJobSettings = *jobSettings;
|
||||
if (pageSettings != NULL)
|
||||
fPageSettings = *pageSettings;
|
||||
if (jobSettings != NULL)
|
||||
fJobSettings = *jobSettings;
|
||||
}
|
||||
|
||||
|
||||
// Implementation of Settings
|
||||
|
||||
Settings* Settings::fSingleton = NULL;
|
||||
Settings* Settings::sSingleton = NULL;
|
||||
|
||||
static const BRect kConfigWindowFrame(30, 30, 220, 120);
|
||||
|
||||
|
@ -44,33 +48,39 @@ Settings::Settings()
|
|||
}
|
||||
|
||||
|
||||
Settings::~Settings() {
|
||||
fSingleton = NULL;
|
||||
Settings::~Settings()
|
||||
{
|
||||
sSingleton = NULL;
|
||||
}
|
||||
|
||||
|
||||
Settings*
|
||||
Settings::GetSettings() {
|
||||
if (fSingleton == NULL) fSingleton = new Settings();
|
||||
return fSingleton;
|
||||
Settings::GetSettings()
|
||||
{
|
||||
if (sSingleton == NULL)
|
||||
sSingleton = new Settings();
|
||||
return sSingleton;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Settings::RemoveAppSettings(int i) {
|
||||
Settings::RemoveAppSettings(int i)
|
||||
{
|
||||
delete fApps.RemoveItemAt(i);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Settings::RemovePrinterSettings(int i) {
|
||||
Settings::RemovePrinterSettings(int i)
|
||||
{
|
||||
delete fPrinters.RemoveItemAt(i);
|
||||
}
|
||||
|
||||
|
||||
AppSettings*
|
||||
Settings::FindAppSettings(const char* mimeType) {
|
||||
for (int i = AppSettingsCount()-1; i >= 0; i --) {
|
||||
Settings::FindAppSettings(const char* mimeType)
|
||||
{
|
||||
for (int i = AppSettingsCount() - 1; i >= 0; i --) {
|
||||
if (strcmp(AppSettingsAt(i)->GetMimeType(), mimeType) == 0)
|
||||
return AppSettingsAt(i);
|
||||
}
|
||||
|
@ -79,8 +89,9 @@ Settings::FindAppSettings(const char* mimeType) {
|
|||
|
||||
|
||||
PrinterSettings*
|
||||
Settings::FindPrinterSettings(const char* printer) {
|
||||
for (int i = PrinterSettingsCount()-1; i >= 0; i --) {
|
||||
Settings::FindPrinterSettings(const char* printer)
|
||||
{
|
||||
for (int i = PrinterSettingsCount() - 1; i >= 0; i --) {
|
||||
if (strcmp(PrinterSettingsAt(i)->GetPrinter(), printer) == 0)
|
||||
return PrinterSettingsAt(i);
|
||||
}
|
||||
|
@ -89,54 +100,59 @@ Settings::FindPrinterSettings(const char* printer) {
|
|||
|
||||
|
||||
void
|
||||
Settings::Save(BFile* file) {
|
||||
BMessage m;
|
||||
// store application settings
|
||||
Settings::Save(BFile* file)
|
||||
{
|
||||
BMessage message;
|
||||
// store application settings
|
||||
for (int i = 0; i < AppSettingsCount(); i++) {
|
||||
AppSettings* app = AppSettingsAt(i);
|
||||
m.AddString("m", app->GetMimeType());
|
||||
m.AddString("p", app->GetPrinter());
|
||||
message.AddString("message", app->GetMimeType());
|
||||
message.AddString("p", app->GetPrinter());
|
||||
}
|
||||
// store printer settings
|
||||
// store printer settings
|
||||
for (int i = 0; i < PrinterSettingsCount(); i++) {
|
||||
PrinterSettings* p = PrinterSettingsAt(i);
|
||||
m.AddString("P", p->GetPrinter());
|
||||
m.AddMessage("S", p->GetPageSettings());
|
||||
m.AddMessage("J", p->GetJobSettings());
|
||||
message.AddString("P", p->GetPrinter());
|
||||
message.AddMessage("S", p->GetPageSettings());
|
||||
message.AddMessage("J", p->GetJobSettings());
|
||||
}
|
||||
|
||||
m.AddBool("UseConfigWindow", fUseConfigWindow);
|
||||
m.AddRect("ConfigWindowFrame", fConfigWindowFrame);
|
||||
m.AddString("DefaultPrinter", fDefaultPrinter);
|
||||
m.Flatten(file);
|
||||
message.AddBool("UseConfigWindow", fUseConfigWindow);
|
||||
message.AddRect("ConfigWindowFrame", fConfigWindowFrame);
|
||||
message.AddString("DefaultPrinter", fDefaultPrinter);
|
||||
message.Flatten(file);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Settings::Load(BFile* file) {
|
||||
BMessage m;
|
||||
if (m.Unflatten(file) == B_OK) {
|
||||
// restore application settings
|
||||
BString mimetype, printer;
|
||||
for (int i = 0; m.FindString("m", i, &mimetype) == B_OK &&
|
||||
m.FindString("p", i, &printer ) == B_OK; i ++) {
|
||||
Settings::Load(BFile* file)
|
||||
{
|
||||
BMessage message;
|
||||
if (message.Unflatten(file) == B_OK) {
|
||||
// restore application settings
|
||||
BString mimetype;
|
||||
BString printer;
|
||||
for (int i = 0; message.FindString("message", i, &mimetype) == B_OK &&
|
||||
message.FindString("p", i, &printer ) == B_OK; i ++) {
|
||||
AddAppSettings(new AppSettings(mimetype.String(), printer.String()));
|
||||
}
|
||||
// restore printer settings
|
||||
BMessage page, job;
|
||||
for (int i = 0; m.FindString("P", i, &printer) == B_OK &&
|
||||
m.FindMessage("S", i, &page) == B_OK &&
|
||||
m.FindMessage("J", i, &job) == B_OK; i ++) {
|
||||
|
||||
// restore printer settings
|
||||
BMessage page;
|
||||
BMessage job;
|
||||
for (int i = 0; message.FindString("P", i, &printer) == B_OK &&
|
||||
message.FindMessage("S", i, &page) == B_OK &&
|
||||
message.FindMessage("J", i, &job) == B_OK; i ++) {
|
||||
AddPrinterSettings(new PrinterSettings(printer.String(), &page, &job));
|
||||
}
|
||||
|
||||
if (m.FindBool("UseConfigWindow", &fUseConfigWindow) != B_OK)
|
||||
if (message.FindBool("UseConfigWindow", &fUseConfigWindow) != B_OK)
|
||||
fUseConfigWindow = true;
|
||||
|
||||
if (m.FindRect("ConfigWindowFrame", &fConfigWindowFrame) != B_OK)
|
||||
if (message.FindRect("ConfigWindowFrame", &fConfigWindowFrame) != B_OK)
|
||||
fConfigWindowFrame = BRect(kConfigWindowFrame);
|
||||
|
||||
if (m.FindString("DefaultPrinter", &fDefaultPrinter) != B_OK)
|
||||
if (message.FindString("DefaultPrinter", &fDefaultPrinter) != B_OK)
|
||||
fDefaultPrinter = "";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -55,7 +55,7 @@ private:
|
|||
BRect fConfigWindowFrame;
|
||||
BString fDefaultPrinter;
|
||||
|
||||
static Settings* fSingleton;
|
||||
static Settings* sSingleton;
|
||||
Settings();
|
||||
|
||||
public:
|
||||
|
|
|
@ -34,10 +34,9 @@ Transport*
|
|||
Transport::Find(const BString& name)
|
||||
{
|
||||
// Look in list to find printer definition
|
||||
for (int32 idx=0; idx < sTransports.CountItems(); idx++) {
|
||||
if (name == sTransports.ItemAt(idx)->Name()) {
|
||||
return sTransports.ItemAt(idx);
|
||||
}
|
||||
for (int32 index = 0; index < sTransports.CountItems(); index++) {
|
||||
if (name == sTransports.ItemAt(index)->Name())
|
||||
return sTransports.ItemAt(index);
|
||||
}
|
||||
|
||||
// None found, so return NULL
|
||||
|
@ -46,9 +45,9 @@ Transport::Find(const BString& name)
|
|||
|
||||
|
||||
Transport*
|
||||
Transport::At(int32 idx)
|
||||
Transport::At(int32 index)
|
||||
{
|
||||
return sTransports.ItemAt(idx);
|
||||
return sTransports.ItemAt(index);
|
||||
}
|
||||
|
||||
|
||||
|
@ -69,19 +68,19 @@ Transport::CountTransports()
|
|||
status_t
|
||||
Transport::Scan(directory_which which)
|
||||
{
|
||||
BDirectory dir;
|
||||
status_t rc;
|
||||
status_t result;
|
||||
BPath path;
|
||||
|
||||
// Try to find specified transport addon directory
|
||||
if ((rc=find_directory(which,&path)) != B_OK)
|
||||
return rc;
|
||||
if ((result = find_directory(which, &path)) != B_OK)
|
||||
return result;
|
||||
|
||||
if ((rc=path.Append("Print/transport")) != B_OK)
|
||||
return rc;
|
||||
if ((result = path.Append("Print/transport")) != B_OK)
|
||||
return result;
|
||||
|
||||
if ((rc=dir.SetTo(path.Path())) != B_OK)
|
||||
return rc;
|
||||
BDirectory dir;
|
||||
if ((result = dir.SetTo(path.Path())) != B_OK)
|
||||
return result;
|
||||
|
||||
// Walk over all entries in directory
|
||||
BEntry entry;
|
||||
|
@ -101,7 +100,6 @@ Transport::Scan(directory_which which)
|
|||
}
|
||||
|
||||
return B_OK;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -130,19 +128,20 @@ Transport::Transport(const BPath& path)
|
|||
|
||||
// Find transport_features symbol, to determine if we need to keep
|
||||
// this transport loaded
|
||||
int* transport_features_ptr;
|
||||
int* transportFeaturesPointer;
|
||||
if (get_image_symbol(id, B_TRANSPORT_FEATURES_SYMBOL,
|
||||
B_SYMBOL_TYPE_DATA, (void**)&transport_features_ptr) != B_OK) {
|
||||
B_SYMBOL_TYPE_DATA, (void**)&transportFeaturesPointer) != B_OK) {
|
||||
unload_add_on(id);
|
||||
} else {
|
||||
fFeatures = *transport_features_ptr;
|
||||
fFeatures = *transportFeaturesPointer;
|
||||
|
||||
if (*transport_features_ptr & B_TRANSPORT_IS_HOTPLUG) {
|
||||
if (fFeatures & B_TRANSPORT_IS_HOTPLUG) {
|
||||
// We are hotpluggable; so keep us loaded!
|
||||
fImageID = id;
|
||||
}
|
||||
else // No extended Transport support; so no need to keep loaded
|
||||
} else {
|
||||
// No extended Transport support; so no need to keep loaded
|
||||
::unload_add_on(id);
|
||||
}
|
||||
}
|
||||
|
||||
sTransports.AddItem(this);
|
||||
|
@ -163,11 +162,11 @@ Transport::ListAvailablePorts(BMessage* msg)
|
|||
status_t rc = B_OK;
|
||||
|
||||
// Load image if not loaded yet
|
||||
if (id == -1 && (id=load_add_on(fPath.Path())) < 0)
|
||||
if (id == -1 && (id = load_add_on(fPath.Path())) < 0)
|
||||
return id;
|
||||
|
||||
// Get pointer to addon function
|
||||
if ((rc=get_image_symbol(id, B_TRANSPORT_LIST_PORTS_SYMBOL,
|
||||
if ((rc = get_image_symbol(id, B_TRANSPORT_LIST_PORTS_SYMBOL,
|
||||
B_SYMBOL_TYPE_TEXT, (void**)&list_ports)) != B_OK)
|
||||
goto done;
|
||||
|
||||
|
|
Loading…
Reference in New Issue