Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1:Test
OpenOffice_org-Quickstarter
oooqs-1.0_rc3-click.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File oooqs-1.0_rc3-click.patch of Package OpenOffice_org-Quickstarter
--- doc/de/index.docbook +++ doc/de/index.docbook @@ -207,7 +207,7 @@ <para> Hier stellen Sie ein, wie &oooqs; reagieren soll, wenn Sie auf dem Icon im <application>Kicker</application> -einen <mousebutton>Doppelklick</mousebutton> ausführen. +einen <mousebutton>Klick</mousebutton> ausführen. Es ist sozusagen die schnellste Methode, ein <application>OpenOffice.org</application>-Programm zu starten. Wer z.B. oft Briefe schreibt, wird dort sicherlich --- doc/en/index.docbook +++ doc/en/index.docbook @@ -195,7 +195,7 @@ <sect1 id="quick-access"> <title>Quick access</title> <para> -If you want &oooqs; to react on a <mousebutton>doubleclick</mousebutton> +If you want &oooqs; to react on a <mousebutton>click</mousebutton> on it's icon in the <application>Kicker</application>, you have to configure it here. It is so to say the fastest method to launch an <application>OpenOffice.org</application>-program. If you, for instance, often --- oooqs/oooqs.cpp +++ oooqs/oooqs.cpp @@ -478,7 +478,7 @@ startDialog->setup_templateView(); startDialog->checkStates(); - setDoubleClickAction(); + setClickAction(); /** Set the widgets in the preferences dialog to the current values */ /** The additional-group has to be loaded before the modules. @@ -552,10 +552,10 @@ } void OooQs::mousePressEvent(QMouseEvent* event){ - if (event->type() == QEvent::MouseButtonDblClick){ - emit doubleClick(); - } if (event->type() == QEvent::MouseButtonPress){ + if (event->button() == QMouseEvent::LeftButton){ + emit click(); + } if (event->button() == QMouseEvent::RightButton){ popupMenu->exec(QCursor::pos()); } @@ -572,53 +572,53 @@ fileOpen(); } } -/** Set the current DoubleClickAction */ -void OooQs::setDoubleClickAction(){ - disconnect(SIGNAL (doubleClick())); +/** Set the current ClickAction */ +void OooQs::setClickAction(){ + disconnect(SIGNAL (click())); QToolTip::remove(this); config->setGroup("Additional"); if (config->readBoolEntry("stdCalc")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (startCalc())); + connect(this, SIGNAL (click()), this, SLOT (startCalc())); QToolTip::add(this, calc->text()); return; } if (config->readBoolEntry("stdDraw")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (startDraw())); + connect(this, SIGNAL (click()), this, SLOT (startDraw())); QToolTip::add(this, draw->text()); return; } if (config->readBoolEntry("stdImpress")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (startImpress())); + connect(this, SIGNAL (click()), this, SLOT (startImpress())); QToolTip::add(this, impress->text()); return; } if (config->readBoolEntry("stdGlobal")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (startGlobal())); + connect(this, SIGNAL (click()), this, SLOT (startGlobal())); QToolTip::add(this, global->text()); return; } if (config->readBoolEntry("stdMath")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (startMath())); + connect(this, SIGNAL (click()), this, SLOT (startMath())); QToolTip::add(this, math->text()); return; } if (config->readBoolEntry("stdWeb")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (startWeb())); + connect(this, SIGNAL (click()), this, SLOT (startWeb())); QToolTip::add(this, web->text()); return; } if (config->readBoolEntry("stdWriter")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (startWriter())); + connect(this, SIGNAL (click()), this, SLOT (startWriter())); QToolTip::add(this, writer->text()); return; } if (config->readBoolEntry("stdOpen")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (fileOpen())); + connect(this, SIGNAL (click()), this, SLOT (fileOpen())); QToolTip::add(this, file->text()); return; } if (config->readBoolEntry("stdLast")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (openLast())); + connect(this, SIGNAL (click()), this, SLOT (openLast())); config->setGroup("General options"); if (config->readEntry("Last file") != ""){ QToolTip::add(this, i18n("Open") + " " + config->readEntry("Last file")); @@ -628,7 +628,7 @@ return; } if (config->readBoolEntry("stdStart")){ - connect(this, SIGNAL (doubleClick()), this, SLOT (openStart())); + connect(this, SIGNAL (click()), this, SLOT (openStart())); QToolTip::add(this, start->text()); return; } --- oooqs/oooqs.h +++ oooqs/oooqs.h @@ -145,8 +145,8 @@ private: /** Call this to (re-)load the config from disk */ void rereadConfig(); - /** Set the current DoubleClickAction */ - void setDoubleClickAction(); + /** Set the current ClickAction */ + void setClickAction(); /** Set the texts on the actions opening the connected module. */ void updateActions(void); /** Restarts OpenOffice if removed from memory. */ @@ -158,8 +158,8 @@ /** check if the soffice.bin is runnig by the user $USER */ int isAnotherOOoInstanceRunning(); signals: - /** Emit when a double click was registered */ - void doubleClick(); + /** Emit when a click was registered */ + void click(); public slots: // Public slots /** Call this to start OpenOffice.org with the given parameters */ void startInstances(QStringList); --- oooqs/prefsdialog.cpp +++ oooqs/prefsdialog.cpp @@ -34,7 +34,7 @@ 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* doubleclick = addVBoxPage( i18n("Quick access"), i18n("Select the option you would like to get called when double-clicking on the OOoQs-icon."), Icon("launch")); + 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")); /** Build the pathes-page */ @@ -164,8 +164,8 @@ modulesLayout->addWidget( recent, 9, 0 ); modulesLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 9, 1 ); - /** Build the doubleclick-page */ - QButtonGroup* stdButtons = new QButtonGroup( doubleclick ); + /** Build the click-page */ + QButtonGroup* stdButtons = new QButtonGroup( click ); stdButtons->setTitle(""); stdButtons->setFrameShape(QGroupBox::NoFrame); stdButtons->setFrameShadow(QGroupBox::Plain); @@ -208,26 +208,26 @@ nothing->setText( i18n( "Nothing" ) ); /** Now layout the widgets */ - QGridLayout* doubleLayout = new QGridLayout( stdButtons->layout(), 13, 2 ); - doubleLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 0, 0, 0, 1 ); - doubleLayout->addWidget( stdCalc, 1, 0 ); - doubleLayout->addWidget( stdMath, 1, 1 ); - doubleLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 2, 2, 0, 1 ); - doubleLayout->addWidget( stdDraw, 3, 0 ); - doubleLayout->addWidget( stdWeb, 3, 1 ); - doubleLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 4, 4, 0, 1 ); - doubleLayout->addWidget( stdImpress, 5, 0 ); - doubleLayout->addWidget( stdWriter, 5, 1 ); - doubleLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 6, 6, 0, 1 ); - doubleLayout->addWidget( stdGlobal, 7, 0 ); - doubleLayout->addWidget( stdOpen, 7, 1 ); - doubleLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 8, 8, 0, 1 ); - doubleLayout->addWidget( stdLast, 9, 0 ); - doubleLayout->addWidget( stdStart, 9, 1 ); - doubleLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 10, 10, 0, 1 ); - doubleLayout->addWidget( nothing, 11, 0 ); - doubleLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 11, 1 ); - doubleLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 12, 12, 0, 1 ); + QGridLayout* clickLayout = new QGridLayout( stdButtons->layout(), 13, 2 ); + clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 0, 0, 0, 1 ); + clickLayout->addWidget( stdCalc, 1, 0 ); + clickLayout->addWidget( stdMath, 1, 1 ); + clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 2, 2, 0, 1 ); + clickLayout->addWidget( stdDraw, 3, 0 ); + clickLayout->addWidget( stdWeb, 3, 1 ); + clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 4, 4, 0, 1 ); + clickLayout->addWidget( stdImpress, 5, 0 ); + clickLayout->addWidget( stdWriter, 5, 1 ); + clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 6, 6, 0, 1 ); + clickLayout->addWidget( stdGlobal, 7, 0 ); + clickLayout->addWidget( stdOpen, 7, 1 ); + clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 8, 8, 0, 1 ); + clickLayout->addWidget( stdLast, 9, 0 ); + clickLayout->addWidget( stdStart, 9, 1 ); + clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 10, 10, 0, 1 ); + clickLayout->addWidget( nothing, 11, 0 ); + clickLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 11, 1 ); + clickLayout->addMultiCell( new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ), 12, 12, 0, 1 ); /** Build the additional-page */ QWidget* advancedContainer = new QWidget(advanced); @@ -335,18 +335,18 @@ QWhatsThis::add(open, i18n("Enable if you want to be able to open files using the quickstarter.")); QWhatsThis::add(recent, i18n("Enable if you want to get a history of the last opened files using the quickstarter.")); - /** Set the whatsthis-help in the doubleclicks-page */ - QWhatsThis::add(stdCalc, i18n("Select to start %1 by double clicking on the OOoQs-icon.").arg(stdCalc->text())); - QWhatsThis::add(stdDraw, i18n("Select to start %1 by double clicking on the OOoQs-icon.").arg(stdDraw->text())); - QWhatsThis::add(stdGlobal, i18n("Select to start %1 by double clicking on the OOoQs-icon.").arg(stdGlobal->text())); - QWhatsThis::add(stdImpress, i18n("Select to start %1 by double clicking on the OOoQs-icon.").arg(stdImpress->text())); - QWhatsThis::add(stdMath, i18n("Select to start %1 by double clicking on the OOoQs-icon.").arg(stdMath->text())); - QWhatsThis::add(stdWeb, i18n("Select to start %1 by double clicking on the OOoQs-icon.").arg(stdWeb->text())); - QWhatsThis::add(stdWriter, i18n("Select to start %1 by double clicking on the OOoQs-icon.").arg(stdWriter->text())); - QWhatsThis::add(stdLast, i18n("Select to start the last opened file by double clicking on the OOoQs-icon.")); - QWhatsThis::add(stdOpen, i18n("Select to open the file-open-dialog by double clicking on the OOoQs-icon.")); - QWhatsThis::add(nothing, i18n("Select to do nothing on double clicks on the OOoQs-icon.")); - QWhatsThis::add(stdStart, i18n("Select to show the \"%1\"-dialog by double clicking on the OOoQs-icon. You can use it to start the activated %2 modules, to start with different wizards if %3 %4 is activated or to start with templates which are stored in the directory you selected earlier in the ...-tab.").arg(((OooQs*)parent())->start->text()).arg(((OooQs*)parent())->suite).arg(((OooQs*)parent())->suite).arg(writer->text())); + /** Set the whatsthis-help in the clicks-page */ + QWhatsThis::add(stdCalc, i18n("Select to start %1 by clicking on the OOoQs-icon.").arg(stdCalc->text())); + QWhatsThis::add(stdDraw, i18n("Select to start %1 by clicking on the OOoQs-icon.").arg(stdDraw->text())); + QWhatsThis::add(stdGlobal, i18n("Select to start %1 by clicking on the OOoQs-icon.").arg(stdGlobal->text())); + QWhatsThis::add(stdImpress, i18n("Select to start %1 by clicking on the OOoQs-icon.").arg(stdImpress->text())); + QWhatsThis::add(stdMath, i18n("Select to start %1 by clicking on the OOoQs-icon.").arg(stdMath->text())); + QWhatsThis::add(stdWeb, i18n("Select to start %1 by clicking on the OOoQs-icon.").arg(stdWeb->text())); + QWhatsThis::add(stdWriter, i18n("Select to start %1 by clicking on the OOoQs-icon.").arg(stdWriter->text())); + QWhatsThis::add(stdLast, i18n("Select to start the last opened file by clicking on the OOoQs-icon.")); + QWhatsThis::add(stdOpen, i18n("Select to open the file-open-dialog by clicking on the OOoQs-icon.")); + QWhatsThis::add(nothing, i18n("Select to do nothing on clicks on the OOoQs-icon.")); + QWhatsThis::add(stdStart, i18n("Select to show the \"%1\"-dialog by clicking on the OOoQs-icon. You can use it to start the activated %2 modules, to start with different wizards if %3 %4 is activated or to start with templates which are stored in the directory you selected earlier in the ...-tab.").arg(((OooQs*)parent())->start->text()).arg(((OooQs*)parent())->suite).arg(((OooQs*)parent())->suite).arg(writer->text())); /** Set the whatsthis-help in the advanced-page */ QWhatsThis::add(enableQuick, i18n("Select to use %1's quickstart-mode. This will speed up the startup-time of new %2 instaces a lot, at the cost of memory. OpenOffice.org 1.0 needs 72 MB of RAM for the quickstart-mode. After applying the changes, you should wait a few seconds to let %3 load the needed data into memory.").arg(((OooQs*)parent())->suite).arg(((OooQs*)parent())->suite).arg(((OooQs*)parent())->suite));
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
