Compare commits

..

20 Commits

Author SHA1 Message Date
Michele Calgaro da891dbf84
Replace TRUE/FALSE with boolean values true/false
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 06e568f880)
6 months ago
TDE Gitea dc7edbd117 Merge translation files from master branch. 6 months ago
TDE Gitea a15dc06a7c Merge translation files from master branch. 6 months ago
TDE Gitea 94d8d26f37 Merge translation files from master branch. 7 months ago
TDE Gitea f3d5bfcf72 Merge translation files from master branch. 7 months ago
TDE Gitea 7f38d7cdd0 Merge translation files from master branch. 11 months ago
TDE Gitea 024e7217ac Merge translation files from master branch. 11 months ago
TDE Gitea f524ba9933 Merge translation files from master branch. 1 year ago
TDE Gitea 1c8410e07d Merge translation files from master branch. 1 year ago
Michele Calgaro dcacb4726c
Use centralized cmake version
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3d6f107128)
2 years ago
Michele Calgaro 9fe1e65bf4
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0075327cfd)
2 years ago
Slávek Banko d88c548dcf
Raise the minimum required version of CMake to 3.5.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8373cb43a7)
2 years ago
TDE Gitea d188a04334 Merge translation files from master branch. 2 years ago
TDE Gitea f286dcd4fa Merge translation files from master branch. 2 years ago
Michele Calgaro e2bfe5bf8e
Replace Q_OBJECT with TQ_OBJECT
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit f161d71e60)
2 years ago
TDE Gitea ef31b019c5 Merge translation files from master branch. 2 years ago
TDE Gitea 1ec24c00ba Merge translation files from master branch. 2 years ago
TDE Gitea 10b1baeb5b Merge translation files from master branch. 2 years ago
TDE Gitea 0efe2cf55e Merge translation files from master branch. 2 years ago
TDE Gitea 1b9b8feb19 Merge translation files from master branch. 2 years ago

@ -54,7 +54,7 @@
#include <twin.h>
#include <tdeglobalsettings.h>
#include <tdeuniqueapplication.h>
#include <kuniqueapplication.h>
#include <kstringhandler.h>
#include <tqtable.h>
#include <kseparator.h>
@ -122,7 +122,7 @@
#endif
#include <tdeversion.h>
#include <tqstyle.h>
#include <tdeglobalaccel.h>
#include <kglobalaccel.h>
#include <kkeydialog.h>
#include <kkeybutton.h>
#include <kcombobox.h>
@ -194,7 +194,7 @@ const MathStructure *KQalculate::getResultPart(int i) {
#include <kiconloader.h>
#include <tdeconfig.h>
TQPixmap loadSystrayIcon(const TQString &icon) {
TDEConfig *appCfg = tdeApp->config();
TDEConfig *appCfg = kapp->config();
TDEConfigGroupSaver configSaver(appCfg, "System Tray");
int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
return TDEGlobal::instance()->iconLoader()->loadIcon(icon, TDEIcon::Panel, iconWidth);
@ -212,7 +212,7 @@ void ModeObject::loadMode() {
mainWin->loadMode(i_mode);
}
KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl) : TDEMainWindow(0, name, fl) {
KQalculate::KQalculate(KUniqueApplication *parent, const char* name, WFlags fl) : TDEMainWindow(0, name, fl) {
if(!name) setName("kqalculate");
@ -285,7 +285,7 @@ KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl
if(use_button_pixmaps) leftButtonsLayout = new TQVBoxLayout(0, 0, 3);
else leftButtonsLayout = new TQVBoxLayout(0, 0, 6);
if(use_button_pixmaps) executeButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
if(use_button_pixmaps) executeButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
else if(rpn_mode) executeButton = new QalculateButton(i18n("Enter"), centralWidget());
else executeButton = new QalculateButton(i18n("="), centralWidget());
executeButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
@ -295,12 +295,12 @@ KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl
leftButtonsSeparator = new KSeparator(TQt::Horizontal, centralWidget());
leftButtonsLayout->addWidget(leftButtonsSeparator);
if(use_button_pixmaps) leftButtonsSeparator->hide();
if(use_button_pixmaps) storeButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("document-save-as", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
if(use_button_pixmaps) storeButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("document-save-as", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
else storeButton = new QalculateButton(i18n("Store"), centralWidget());
storeButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
TQToolTip::add(storeButton, i18n("Store result as variable"));
leftButtonsLayout->addWidget(storeButton);
if(use_button_pixmaps) convertButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("qalculate_convert", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
if(use_button_pixmaps) convertButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("qalculate_convert", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", centralWidget());
else convertButton = new QalculateButton(i18n("Convert"), centralWidget());
convertButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
TQToolTip::add(convertButton, i18n("Convert units in result"));
@ -554,27 +554,27 @@ KQalculate::KQalculate(TDEUniqueApplication *parent, const char* name, WFlags fl
stackPageLayout->addWidget(stackList);
if(use_button_pixmaps) stackPageButtonsLayout = new TQVBoxLayout(stackPageLayout, 3);
else stackPageButtonsLayout = new TQVBoxLayout(stackPageLayout, 6);
if(use_button_pixmaps) registerUpButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("go-up", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
if(use_button_pixmaps) registerUpButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("go-up", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else registerUpButton = new QalculateButton(i18n("Up"), stackPage);
TQToolTip::add(registerUpButton, i18n("Move selected register up"));
registerUpButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
stackPageButtonsLayout->addWidget(registerUpButton);
if(use_button_pixmaps) registerDownButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("go-down", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
if(use_button_pixmaps) registerDownButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("go-down", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else registerDownButton = new QalculateButton(i18n("Down"), stackPage);
TQToolTip::add(registerDownButton, i18n("Move selected register down"));
registerDownButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
stackPageButtonsLayout->addWidget(registerDownButton);
if(use_button_pixmaps) editRegisterButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("edit", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
if(use_button_pixmaps) editRegisterButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("edit", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else editRegisterButton = new QalculateButton(i18n("Edit"), stackPage);
TQToolTip::add(editRegisterButton, i18n("Edit value of selected register"));
editRegisterButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
stackPageButtonsLayout->addWidget(editRegisterButton);
if(use_button_pixmaps) deleteRegisterButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("edit-delete", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
if(use_button_pixmaps) deleteRegisterButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("edit-delete", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else deleteRegisterButton = new QalculateButton(i18n("Delete"), stackPage);
TQToolTip::add(deleteRegisterButton, i18n("Delete selected register"));
deleteRegisterButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
stackPageButtonsLayout->addWidget(deleteRegisterButton);
if(use_button_pixmaps) clearStackButton = new QalculateButton(tdeApp->iconLoader()->loadIconSet("view_remove", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
if(use_button_pixmaps) clearStackButton = new QalculateButton(TDEApplication::kApplication()->iconLoader()->loadIconSet("view_remove", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM), "", stackPage);
else clearStackButton = new QalculateButton(i18n("Clear"), stackPage);
TQToolTip::add(clearStackButton, i18n("Clear the RPN stack"));
clearStackButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed, false);
@ -5896,23 +5896,23 @@ void KQalculate::applyPreferences() {
if(use_button_pixmaps) {
leftButtonsLayout->setSpacing(3);
executeButton->setText("");
executeButton->setIconSet(tdeApp->iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
executeButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
storeButton->setText("");
storeButton->setIconSet(tdeApp->iconLoader()->loadIconSet("document-save-as", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
storeButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("document-save-as", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
convertButton->setText("");
convertButton->setIconSet(tdeApp->iconLoader()->loadIconSet("qalculate_convert", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
convertButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("qalculate_convert", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
leftButtonsSeparator->hide();
stackPageButtonsLayout->setSpacing(3);
registerUpButton->setText("");
registerUpButton->setIconSet(tdeApp->iconLoader()->loadIconSet("go-up", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
registerUpButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("go-up", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
registerDownButton->setText("");
registerDownButton->setIconSet(tdeApp->iconLoader()->loadIconSet("go-down", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
registerDownButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("go-down", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
editRegisterButton->setText("");
editRegisterButton->setIconSet(tdeApp->iconLoader()->loadIconSet("edit", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
editRegisterButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("edit", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
deleteRegisterButton->setText("");
deleteRegisterButton->setIconSet(tdeApp->iconLoader()->loadIconSet("edit-delete", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
deleteRegisterButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("edit-delete", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
clearStackButton->setText("");
clearStackButton->setIconSet(tdeApp->iconLoader()->loadIconSet("view_remove", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
clearStackButton->setIconSet(TDEApplication::kApplication()->iconLoader()->loadIconSet("view_remove", TDEIcon::Small, ICON_SIZE_SMALL_MEDIUM));
} else {
leftButtonsLayout->setSpacing(6);
if(rpn_mode) executeButton->setText(i18n("Enter"));

@ -79,7 +79,7 @@ class TQRadioButton;
class QalculateButton;
class TQVBoxLayout;
class KSeparator;
class TDEUniqueApplication;
class KUniqueApplication;
class TDEConfig;
class TQListViewItem;
class QalculateRPNStackListView;
@ -116,7 +116,7 @@ class KQalculate : public TDEMainWindow {
public:
KQalculate(TDEUniqueApplication *parent = 0, const char* name = 0, WFlags fl = WType_TopLevel | WDestructiveClose);
KQalculate(KUniqueApplication *parent = 0, const char* name = 0, WFlags fl = WType_TopLevel | WDestructiveClose);
virtual ~KQalculate();
void setupActions();
@ -193,7 +193,7 @@ public:
TQVBoxLayout *stackPageButtonsLayout;
QalculateButton *registerUpButton, *registerDownButton, *deleteRegisterButton, *editRegisterButton, *clearStackButton;
TQPopupMenu *stackMenu;
TDEUniqueApplication *m_parent;
KUniqueApplication *m_parent;
KSystemTray *trayicon;
QalculateButton *executeButton, *storeButton, *convertButton;
QalculateButton *functionsButton;

@ -26,7 +26,7 @@
#include "preferences.h"
#include <string>
#include <twin.h>
#include <tdeuniqueapplication.h>
#include <kuniqueapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <tdelocale.h>
@ -77,7 +77,7 @@ extern TQValueVector<TQString> recent_units_pre;
TQTimer *error_timer;
void create_qalculate_window(TDEUniqueApplication *parent) {
void create_qalculate_window(KUniqueApplication *parent) {
TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("utf8"));
@ -223,7 +223,7 @@ void start_qalculate() {
}
class QalculateApp : public TDEUniqueApplication {
class QalculateApp : public KUniqueApplication {
public:
@ -276,7 +276,7 @@ public:
start_qalculate();
}
started = true;
return TDEUniqueApplication::newInstance();
return KUniqueApplication::newInstance();
}
started = true;
return 0;
@ -292,7 +292,7 @@ int main(int argc, char **argv) {
about.addAuthor("Niklas Knutsson", 0, "nq@altern.org");
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);
TDEUniqueApplication::addCmdLineOptions();
KUniqueApplication::addCmdLineOptions();
if(!QalculateApp::start()) {
return 0;

@ -153,7 +153,7 @@ QalculateEditFunctionDialog::~QalculateEditFunctionDialog() {}
void QalculateEditFunctionDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-function-creation");
TDEApplication::kApplication()->invokeHelp("qalculate-function-creation");
}
void QalculateEditFunctionDialog::argumentSelectionChanged() {

@ -126,7 +126,7 @@ QalculateEditMatrixVectorDialog::QalculateEditMatrixVectorDialog(TQWidget *paren
QalculateEditMatrixVectorDialog::~QalculateEditMatrixVectorDialog() {}
void QalculateEditMatrixVectorDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-vectors-matrices");
TDEApplication::kApplication()->invokeHelp("qalculate-vectors-matrices");
}
void QalculateEditMatrixVectorDialog::typeChanged(int i) {

@ -135,7 +135,7 @@ QalculateEditUnitDialog::QalculateEditUnitDialog(TQWidget *parent, const char *n
QalculateEditUnitDialog::~QalculateEditUnitDialog() {}
void QalculateEditUnitDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-unit-creation");
TDEApplication::kApplication()->invokeHelp("qalculate-unit-creation");
}
void QalculateEditUnitDialog::slotOk() {

@ -121,7 +121,7 @@ void QalculateEditUnknownVariableDialog::signComboActivated(int i) {
}
void QalculateEditUnknownVariableDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-variable-creation");
TDEApplication::kApplication()->invokeHelp("qalculate-variable-creation");
}
void QalculateEditUnknownVariableDialog::slotOk() {

@ -91,7 +91,7 @@ QalculateEditVariableDialog::QalculateEditVariableDialog(TQWidget *parent, const
QalculateEditVariableDialog::~QalculateEditVariableDialog() {}
void QalculateEditVariableDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-variable-creation");
TDEApplication::kApplication()->invokeHelp("qalculate-variable-creation");
}
void QalculateEditVariableDialog::slotOk() {

@ -76,7 +76,7 @@ QalculateExportCSVDialog::QalculateExportCSVDialog(TQWidget *parent, const char
QalculateExportCSVDialog::~QalculateExportCSVDialog() {}
void QalculateExportCSVDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-import-export-csv");
TDEApplication::kApplication()->invokeHelp("qalculate-import-export-csv");
}
void QalculateExportCSVDialog::exportSourceChanged(int i) {

@ -110,7 +110,7 @@ QalculateFunctionsDialog::~QalculateFunctionsDialog() {
}
void QalculateFunctionsDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-managers");
TDEApplication::kApplication()->invokeHelp("qalculate-managers");
}
void QalculateFunctionsDialog::updateFunctionTree() {

@ -101,7 +101,7 @@ QalculateImportCSVDialog::~QalculateImportCSVDialog() {
}
void QalculateImportCSVDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-import-export-csv");
TDEApplication::kApplication()->invokeHelp("qalculate-import-export-csv");
}
void QalculateImportCSVDialog::delimiterChanged(int i) {

@ -317,7 +317,7 @@ QalculatePlotDialog::QalculatePlotDialog(TQWidget *parent, const char *name) : K
QalculatePlotDialog::~QalculatePlotDialog() {}
void QalculatePlotDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-plotting");
TDEApplication::kApplication()->invokeHelp("qalculate-plotting");
}
void QalculatePlotDialog::saveMode() {

@ -239,8 +239,8 @@ QalculateResultDisplay::QalculateResultDisplay(TQWidget *parent, const char *nam
//connect(this, TQ_SIGNAL(anchorClicked(const TQString&, const TQString&)), this, TQ_SLOT(onAnchorClicked(const TQString&, const TQString&)));
connect(this, TQ_SIGNAL(doubleClicked(int, int)), this, TQ_SLOT(onDoubleClicked(int, int)));
if(tdeApp) {
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged()));
if(kapp) {
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged()));
}
}
@ -400,9 +400,9 @@ void QalculateResultDisplay::editMatrix() {
}
void QalculateResultDisplay::paletteChanged() {
TQPalette p = tdeApp ? tdeApp->palette() : palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
TQPalette p = kapp ? kapp->palette() : palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
p.setColor(TQColorGroup::Text, p.color(TQPalette::Normal, TQColorGroup::Foreground));
setPalette(p);
}

@ -141,7 +141,7 @@ QalculateUnitsDialog::~QalculateUnitsDialog() {
}
void QalculateUnitsDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-managers");
TDEApplication::kApplication()->invokeHelp("qalculate-managers");
}
void QalculateUnitsDialog::updateUnitTree() {

@ -108,7 +108,7 @@ QalculateVariablesDialog::QalculateVariablesDialog(TQWidget *parent, const char
QalculateVariablesDialog::~QalculateVariablesDialog() {}
void QalculateVariablesDialog::slotHelp() {
tdeApp->invokeHelp("qalculate-managers");
TDEApplication::kApplication()->invokeHelp("qalculate-managers");
}
void QalculateVariablesDialog::updateVariableTree() {

Loading…
Cancel
Save