File oooqs-1.0_rc3-gcc-4.3.diff of Package OpenOffice_org-Quickstarter
--- oooqs/opendialog.cpp.old 2007-11-26 11:05:09.000000000 +0100
+++ oooqs/opendialog.cpp 2007-11-26 11:14:16.000000000 +0100
@@ -27,19 +27,19 @@
#include <ktoolbar.h>
#include <kmessagebox.h>
-#define Icon(x) KGlobal::instance()->iconLoader()->loadIcon(x, KIcon::NoGroup)
-#define SmallIcon(x) KGlobal::instance()->iconLoader()->loadIcon(x, KIcon::NoGroup, KIcon::SizeSmall)
+#define OpenDialogIcon(x) KGlobal::instance()->iconLoader()->loadIcon(x, KIcon::NoGroup)
+#define SmallOpenDialogIcon(x) KGlobal::instance()->iconLoader()->loadIcon(x, KIcon::NoGroup, KIcon::SizeSmall)
openDialog::openDialog(QWidget *parent, const char *name, QString title ) : KDialogBase(KDialogBase::IconList,
title, KDialogBase::Help | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Cancel, parent, name)
{
- QVBox* newDoc = addVBoxPage( i18n("New Document"), i18n("Create a new document"), Icon("filenew"));
+ QVBox* newDoc = addVBoxPage( i18n("New Document"), i18n("Create a new document"), OpenDialogIcon("filenew"));
newDocView = new KListView(newDoc);
newDocEmpty = new QLabel(i18n("No %1-componentes activated in the configuration dialog").arg(((OooQs*)parent)->suite), newDoc);
- QVBox* wizard = addVBoxPage( i18n("Wizards"), i18n("Start with a Wizard"), Icon("wizard"));
+ QVBox* wizard = addVBoxPage( i18n("Wizards"), i18n("Start with a Wizard"), OpenDialogIcon("wizard"));
wizardView = new KListView(wizard);
wizardEmpty = new QLabel(i18n("No wizards activated.\nActivate \"%1 Writer\" in the configuration dialog").arg(((OooQs*)parent)->suite), wizard);
- QVBox* templates = addVBoxPage( i18n("Templates"), i18n("Create a new document from template"), Icon("oooqs"));
+ QVBox* templates = addVBoxPage( i18n("Templates"), i18n("Create a new document from template"), OpenDialogIcon("oooqs"));
/** Create the toolbar */
KToolBar* toolbar = new KToolBar(templates, 0, true);
@@ -140,37 +140,37 @@ void openDialog::setup_newDocView(int en
if ((entries&Calc) == Calc){
calc = new KListViewItem(newDocView);
calc->setText(0, ((OooQs*)parent())->calcLabel);
- calc->setPixmap(0, SmallIcon(((OooQs*)parent())->calcIconName));
+ calc->setPixmap(0, SmallOpenDialogIcon(((OooQs*)parent())->calcIconName));
}
if ((entries&Draw) == Draw){
draw = new KListViewItem(newDocView);
draw->setText(0, ((OooQs*)parent())->drawLabel);
- draw->setPixmap(0, SmallIcon(((OooQs*)parent())->drawIconName));
+ draw->setPixmap(0, SmallOpenDialogIcon(((OooQs*)parent())->drawIconName));
}
if ((entries&Impress) == Impress){
impress = new KListViewItem(newDocView);
impress->setText(0, ((OooQs*)parent())->impressLabel);
- impress->setPixmap(0, SmallIcon(((OooQs*)parent())->impressIconName));
+ impress->setPixmap(0, SmallOpenDialogIcon(((OooQs*)parent())->impressIconName));
}
if ((entries&Global) == Global){
global = new KListViewItem(newDocView);
global->setText(0, ((OooQs*)parent())->globalLabel);
- global->setPixmap(0, SmallIcon(((OooQs*)parent())->globalIconName));
+ global->setPixmap(0, SmallOpenDialogIcon(((OooQs*)parent())->globalIconName));
}
if ((entries&Math) == Math){
math = new KListViewItem(newDocView);
math->setText(0, ((OooQs*)parent())->mathLabel);
- math->setPixmap(0, SmallIcon(((OooQs*)parent())->mathIconName));
+ math->setPixmap(0, SmallOpenDialogIcon(((OooQs*)parent())->mathIconName));
}
if ((entries&Web) == Web){
web = new KListViewItem(newDocView);
web->setText(0, ((OooQs*)parent())->webLabel);
- web->setPixmap(0, SmallIcon(((OooQs*)parent())->webIconName));
+ web->setPixmap(0, SmallOpenDialogIcon(((OooQs*)parent())->webIconName));
}
if ((entries&Writer) == Writer){
writer = new KListViewItem(newDocView);
writer->setText(0, ((OooQs*)parent())->writerLabel);
- writer->setPixmap(0, SmallIcon(((OooQs*)parent())->writerIconName));
+ writer->setPixmap(0, SmallOpenDialogIcon(((OooQs*)parent())->writerIconName));
}
/** Set the standard-selection in newDoc */
@@ -216,32 +216,32 @@ void openDialog::setup_wizardView(int en
if ((entries&Agenda) == Agenda){
agenda = new KListViewItem(wizardView);
agenda->setText(0, i18n("Agenda"));
- agenda->setPixmap(0, SmallIcon("text_wizard"));
+ agenda->setPixmap(0, SmallOpenDialogIcon("text_wizard"));
}
if ((entries&Letter) == Letter){
letter = new KListViewItem(wizardView);
letter->setText(0, i18n("Letter"));
- letter->setPixmap(0, SmallIcon("kword"));
+ letter->setPixmap(0, SmallOpenDialogIcon("kword"));
}
if ((entries&Fax) == Fax){
fax = new KListViewItem(wizardView);
fax->setText(0, i18n("Fax"));
- fax->setPixmap(0, SmallIcon("kfax"));
+ fax->setPixmap(0, SmallOpenDialogIcon("kfax"));
}
if ((entries&Label) == Label){
label = new KListViewItem(wizardView);
label->setText(0, i18n("Label"));
- label->setPixmap(0, SmallIcon("info"));
+ label->setPixmap(0, SmallOpenDialogIcon("info"));
}
if ((entries&Memo) == Memo){
memo = new KListViewItem(wizardView);
memo->setText(0, i18n("Memo"));
- memo->setPixmap(0, SmallIcon("knode"));
+ memo->setPixmap(0, SmallOpenDialogIcon("knode"));
}
if ((entries&VCARD) == VCARD){
vcard = new KListViewItem(wizardView);
vcard->setText(0, i18n("VCARD"));
- vcard->setPixmap(0, SmallIcon("vcard"));
+ vcard->setPixmap(0, SmallOpenDialogIcon("vcard"));
}
/** Set the standard-selection in wizard */
--- oooqs/prefsdialog.cpp.old 2007-11-26 11:13:44.000000000 +0100
+++ oooqs/prefsdialog.cpp 2007-11-26 11:13:13.000000000 +0100
@@ -27,15 +27,15 @@
#include <klocale.h>
#include <kmessagebox.h>
-#define Icon(x) KGlobal::instance()->iconLoader()->loadIcon(x, KIcon::NoGroup)
+#define PrefsDialogIcon(x) KGlobal::instance()->iconLoader()->loadIcon(x, KIcon::NoGroup)
prefsDialog::prefsDialog(QWidget *parent, const char *name, QString title ) : KDialogBase(KDialogBase::IconList,
title, KDialogBase::Help | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Cancel, parent, name) {
- QVBox* pathes = addVBoxPage( i18n("General"), i18n("General configuration"), Icon("gear"));
- QVBox* modules = addVBoxPage( i18n("Components"), i18n("Select the entries you would like to see in the menu and in the \"%1\"-dialog").arg(i18n("Start with...")), Icon("exec"));
- QVBox* click = addVBoxPage( i18n("Quick access"), i18n("Select the option you would like to get called when clicking on the OOoQs-icon."), Icon("launch"));
- QVBox* advanced = addVBoxPage( i18n("Advanced"), i18n("Advanced settings"), Icon("oooqs"));
+ QVBox* pathes = addVBoxPage( i18n("General"), i18n("General configuration"), PrefsDialogIcon("gear"));
+ QVBox* modules = addVBoxPage( i18n("Components"), i18n("Select the entries you would like to see in the menu and in the \"%1\"-dialog").arg(i18n("Start with...")), PrefsDialogIcon("exec"));
+ QVBox* click = addVBoxPage( i18n("Quick access"), i18n("Select the option you would like to get called when clicking on the OOoQs-icon."), PrefsDialogIcon("launch"));
+ QVBox* advanced = addVBoxPage( i18n("Advanced"), i18n("Advanced settings"), PrefsDialogIcon("oooqs"));
/** Build the pathes-page */
QWidget* generalContainer = new QWidget(pathes);
@@ -254,7 +254,7 @@ prefsDialog::prefsDialog(QWidget *parent
recentLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
recentLayout->addWidget(maxEntries);
- clear = new KPushButton( Icon("fileclose"), 0, advancedContainer );
+ clear = new KPushButton( PrefsDialogIcon("fileclose"), 0, advancedContainer );
clear->setText( i18n( "Clear history of recently opened files" ) );
clear->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed));
