TDE
/
keep
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: TDE:master
Branches Tags
TDE:r14.1.x
TDE:master
TDE:r14.0.x
TDE:v3.5.13-sru
...
pull from: TDE:v3.5.13-sru
Branches Tags
TDE:r14.1.x
TDE:master
TDE:r14.0.x
TDE:v3.5.13-sru

74 Commits
master ... v3.5.13-sr

Author SHA1 Message Date
TDE Gitea 1795a3c7c4 Reset submodule main/applications/utilities/keep/admin to latest HEAD
2 years ago
Slávek Banko 7ede928a17
Remove cmake submodule since it has now been replaced by cmake-trinity dependency.
2 years ago
TDE Gitea 5f25bcb24c Reset submodule main/applications/keep/cmake to latest HEAD
2 years ago
TDE Gitea a25e222f70 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea bd46e94dcd Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea ec2cb7b1ce Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 49121081ad Reset submodule main/applications/keep/admin to latest HEAD
3 years ago
TDE Gitea 62f693ccd6 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea f425f7ca03 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 135aca49a2 Reset submodule main/applications/keep/admin to latest HEAD
3 years ago
TDE Gitea 8965a99f93 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea f83cb180ab Reset submodule main/applications/keep/admin to latest HEAD
3 years ago
TDE Gitea ef7f8d5b78 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 6447115efc Reset submodule main/applications/keep/admin to latest HEAD
3 years ago
TDE Gitea 4b0515dc82 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 4696d18db5 Reset submodule main/applications/keep/admin to latest HEAD
3 years ago
TDE Gitea 1903f212f9 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 70c9405df4 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea fc1c50779b Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea cf601f2d07 Reset submodule main/applications/keep/admin to latest HEAD
3 years ago
TDE Gitea f152169966 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea d68548c31d Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 3f79831a4c Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 727d44087a Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 08e62cf587 Reset submodule main/applications/keep/admin to latest HEAD
3 years ago
TDE Gitea 4a76637bf2 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea aae4a77f30 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea ba30ad4ec4 Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea f54dcc5e4a Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea aacc8c3e0f Reset submodule main/applications/keep/cmake to latest HEAD
3 years ago
TDE Gitea 0b8f167b28 Reset submodule main/applications/keep/cmake to latest HEAD
4 years ago
TDE Gitea b39d33ba89 Reset submodule main/applications/keep/cmake to latest HEAD
4 years ago
TDE Gitea 40d1fa30b9 Reset submodule main/applications/keep/cmake to latest HEAD
4 years ago
TDE Gitea 213571d3ca Reset submodule main/applications/keep/cmake to latest HEAD
4 years ago
Slávek Banko 2263fe8d81
Switch all submodules to https.
4 years ago
TDE Gitea 94484af3b0 Reset submodule main/applications/keep/cmake to latest HEAD
4 years ago
TDE Gitea 9f1e1bf276 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea 0be6d85cc1 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea 180eb4f5e1 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea d18d20ab95 Reset submodule main/applications/keep/admin to latest HEAD
5 years ago
TDE Gitea 6aa8892e3e Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea 50e9c024e5 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea de9f0e6f30 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea 01b2f4f6be Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea 35490dc0f6 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea 2fafa3c402 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea 2941492dbf Reset submodule main/applications/keep/admin to latest HEAD
5 years ago
TDE Gitea 3d1d1d60e8 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea 08bef2eaa6 Reset submodule main/applications/keep/cmake to latest HEAD
5 years ago
TDE Gitea a9f3f0e612 Reset submodule main/applications/keep/admin to latest HEAD
5 years ago
Slávek Banko b2904c8922 Reset submodule main/applications/keep/admin to latest HEAD
5 years ago
Slávek Banko 66ca4e29e2 Reset submodule main/applications/keep/admin to latest HEAD
5 years ago
Slávek Banko 69ea554d24 Reset submodule main/applications/keep/admin to latest HEAD
5 years ago
Slávek Banko d776fb80b4 Reset submodule main/applications/keep/cmake to latest HEAD
7 years ago
Slávek Banko eea0342465 Reset submodule main/applications/keep/admin to latest HEAD
7 years ago
Slávek Banko 89f0ee6b6d Reset submodule main/applications/keep/cmake to latest HEAD
8 years ago
Slávek Banko ae932223f8 Reset submodule main/applications/keep/admin to latest HEAD
8 years ago
Slávek Banko 60289af72b Reset submodule main/applications/keep/admin to latest HEAD
11 years ago
Slávek Banko 54c979399a Reset submodule main/applications/keep/admin to latest HEAD
11 years ago
Slávek Banko 12ea3909f9 Reset submodule main/applications/keep/cmake to latest HEAD
11 years ago
Slávek Banko 5e83f10aef Reset submodule main/applications/keep/cmake to latest HEAD
11 years ago
Slávek Banko fe6a9e61b2 Reset submodule main/applications/keep/cmake to latest HEAD
11 years ago
Slávek Banko 1b56b148b5 Reset submodule main/applications/keep/cmake to latest HEAD
11 years ago
Slávek Banko 697a1566ac Reset submodule main/applications/keep/admin to latest HEAD
11 years ago
Slávek Banko a20f71964a Reset submodule main/applications/keep/cmake to latest HEAD
11 years ago
Slávek Banko 47920dd178 Reset submodule main/applications/keep/cmake to latest HEAD
11 years ago
Slávek Banko 6c6b645769 Reset submodule main/applications/keep/admin to latest HEAD
11 years ago
Slávek Banko e3f6f8331a Update final HTML install path so all modules are consistent.
11 years ago
Darrell Anderson 4883689743 Update HTML install path references.
11 years ago
Timothy Pearson bafdbbb64c Rename obsolete tq methods to standard names
11 years ago
Timothy Pearson db71c9ce19 Remove additional unneeded tq method conversions
11 years ago
Timothy Pearson e3459a90cb Rename old tq methods that no longer need a unique name
11 years ago
Timothy Pearson 652b077729 Fix FTBFS
11 years ago
Slávek Banko d44ff11e1e Add common directories
11 years ago
28 changed files with 115 additions and 110 deletions
Show Stats

3
.gitmodules vendored
Unescape View File

@ -0,0 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

2
acinclude.m4
Unescape View File

@ -428,7 +428,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
kde_htmldir='\${datadir}/doc/HTML'
kde_htmldir='\${datadir}/doc/tde/HTML'
fi
if test -z "$kde_appsdir"; then
kde_appsdir='\${datadir}/applnk'

1
admin

@ -0,0 +1 @@
Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

42
keep/app/actionview.ui
Unescape View File

@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout22</cstring>
<cstring>layout22</cstring>
</property>
<vbox>
<property name="name">
@ -56,7 +56,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout21</cstring>
<cstring>layout21</cstring>
</property>
<vbox>
<property name="name">
@ -64,7 +64,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@ -82,13 +82,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>32767</height>
@ -118,7 +118,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@ -136,13 +136,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>35</height>
@ -172,7 +172,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@ -190,13 +190,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>32767</height>
@ -226,7 +226,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@ -244,13 +244,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>32767</height>
@ -280,7 +280,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15_4</cstring>
<cstring>layout15_4</cstring>
</property>
<hbox>
<property name="name">
@ -298,13 +298,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>32767</height>
@ -357,7 +357,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@ -365,7 +365,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -447,7 +447,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -493,7 +493,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>85</height>

4
keep/app/addbackupwizard.cpp
Unescape View File

@ -28,7 +28,7 @@
AddBackupWizard::AddBackupWizard(TQWidget *parent,const char* name): KWizard( parent, name, true)
{
initView();
resize( tqminimumSizeHint() );
resize( minimumSizeHint() );
setNextEnabled(page1,false);
setNextEnabled(page2,false);
@ -58,7 +58,7 @@ AddBackupWizard::AddBackupWizard(Backup backup,TQWidget *parent,const char* name
includeExcludeDialog->setIncludeExcludeList(backup.includeExcludeList());
advancedBackupConfigDialog->setOptionList(backup.optionList());
resize( tqminimumSizeHint() );
resize( minimumSizeHint() );
setNextEnabled(page1,true);
setNextEnabled(page2,true);

12
keep/app/addbackupwizard1view.ui
Unescape View File

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -78,7 +78,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
@ -115,7 +115,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>260</height>

12
keep/app/addbackupwizard2view.ui
Unescape View File

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -43,7 +43,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -81,7 +81,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@ -92,7 +92,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>381</height>

24
keep/app/addbackupwizard3view.ui
Unescape View File

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -86,7 +86,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@ -129,7 +129,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -137,7 +137,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6_2</cstring>
<cstring>layout6_2</cstring>
</property>
<hbox>
<property name="name">
@ -145,7 +145,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -187,7 +187,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@ -249,7 +249,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -298,7 +298,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@ -336,7 +336,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -388,7 +388,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>46</height>

2
keep/app/advancedbackupconfigdialog.cpp
Unescape View File

@ -39,7 +39,7 @@ AdvancedBackupConfigDialog::AdvancedBackupConfigDialog(TQWidget *parent):KDialog
topLayout->addWidget( m_advancedBackupConfigView,0,0 );
m_advancedBackupConfigView->optionList->availableListBox()->insertStringList(allOptionList());
resize( TQSize(350,450).expandedTo(tqminimumSizeHint()) );
resize( TQSize(350,450).expandedTo(minimumSizeHint()) );
}
TQStringList AdvancedBackupConfigDialog::optionList()

2
keep/app/advancedbackupconfigview.ui
Unescape View File

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">

6
keep/app/backuplistview.ui
Unescape View File

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>480</height>

6
keep/app/forcebackupdialog.cpp
Unescape View File

@ -45,9 +45,9 @@
ForceBackupDialog::ForceBackupDialog(TQWidget *parent):KDialogBase(Plain, i18n("Backup now"),
Help|Cancel|Ok, Cancel, parent, "forceBackupDialog", true, false)
{
TQGridLayout* toptqlayout = new TQGridLayout(plainPage());
TQGridLayout* toplayout = new TQGridLayout(plainPage());
m_view = new ForceBackupDialogView(plainPage());
toptqlayout->addWidget(m_view,0,0);
toplayout->addWidget(m_view,0,0);
loadBackupList();
@ -93,7 +93,7 @@ void ForceBackupDialog::slotForceBackup()
void ForceBackupDialog::slotBackupError(Backup backup,TQString errorMessage)
{
KMessageBox::error(this,i18n("<p><b>An error occured making %1 backup:</b></p><p>%2</p>").tqarg(backup.source()).tqarg(errorMessage));
KMessageBox::error(this,i18n("<p><b>An error occured making %1 backup:</b></p><p>%2</p>").arg(backup.source()).arg(errorMessage));
}
#include "forcebackupdialog.moc"

2
keep/app/forcebackupdialogview.ui
Unescape View File

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout21</cstring>
<cstring>layout21</cstring>
</property>
<vbox>
<property name="name">

10
keep/app/generalconfigview.ui
Unescape View File

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -79,7 +79,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>120</height>

2
keep/app/includeexcludedialog.cpp
Unescape View File

@ -53,7 +53,7 @@ IncludeExcludeDialog::IncludeExcludeDialog(TQWidget *parent):KDialogBase(Plain,
connect(m_view->exclude,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotExclude()));
connect(m_view->remove,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotRemove()));
resize( TQSize(450,450).expandedTo(tqminimumSizeHint()) );
resize( TQSize(450,450).expandedTo(minimumSizeHint()) );
}
TQStringList IncludeExcludeDialog::includeExcludeList()

12
keep/app/includeexcludeview.ui
Unescape View File

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -61,7 +61,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout18</cstring>
<cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@ -115,7 +115,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -159,7 +159,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>121</height>

4
keep/app/keepmainwindow.cpp
Unescape View File

@ -63,7 +63,7 @@ KeepMainWindow::KeepMainWindow(TQWidget *parent, const char *name): KMainWindow(
initActions();
initConnections();
resize( tqminimumSizeHint() );
resize( minimumSizeHint() );
createGUI(0L);
@ -125,7 +125,7 @@ void KeepMainWindow::slotCheckRDB()
{
RDBManager manager;
if ( manager.isRDB() )
KMessageBox::information(this, i18n("<b>The application rdiff-backup has been detected on your system.</b><br><br> You're running version %1 of rdiff-backup.").tqarg(manager.RDBVersion()));
KMessageBox::information(this, i18n("<b>The application rdiff-backup has been detected on your system.</b><br><br> You're running version %1 of rdiff-backup.").arg(manager.RDBVersion()));
else
KMessageBox::error(this,i18n("<b>The application rdiff-backup has not been detected on your system.</b><br><br>If rdiff-backup is not installed, Keep will not be able to make backups. To fix this problem, install rdiff-backup on your system."));

2
keep/app/logview.ui
Unescape View File

@ -26,7 +26,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">

6
keep/app/restorebackupwizard.cpp
Unescape View File

@ -62,7 +62,7 @@ RestoreBackupWizard::RestoreBackupWizard(TQWidget *parent,const char* name): KWi
setNextEnabled(page2,true);
setFinishEnabled(page3, false);
resize( tqminimumSizeHint() );
resize( minimumSizeHint() );
}
RestoreBackupWizard::~RestoreBackupWizard()
@ -222,7 +222,7 @@ void RestoreBackupWizard::setupPage3()
restoreBackupWizard3View = new RestoreBackupWizard3View(page3,"restoreBackupWizard3View");
restoreBackupWizard3View->incrementList->setSorting(0,false);
restoreBackupWizard3View->lblDate->setText(TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate));
restoreBackupWizard3View->lblDate->setText(TQDateTime::currentDateTime().toString(Qt::LocalDate));
addPage( page3, "Date to restore" );
}
@ -287,7 +287,7 @@ void RestoreBackupWizard::slotRestoreBackup()
void RestoreBackupWizard::slotRestoreError(Backup backup,TQString errorMessage)
{
KMessageBox::error(this,i18n("<p><b>An error occured restoring %1 backup:</b></p><p>%2</p>").tqarg(backup.dest()).tqarg(errorMessage));
KMessageBox::error(this,i18n("<p><b>An error occured restoring %1 backup:</b></p><p>%2</p>").arg(backup.dest()).arg(errorMessage));
}
#include "restorebackupwizard.moc"

1
keep/app/restorebackupwizard.h
Unescape View File

@ -22,6 +22,7 @@
#include <kwizard.h>
#include <kpopupmenu.h>
#include <tqhbox.h>
#include <tqlistview.h>
#include "restorebackupwizard1view.h"
#include "restorebackupwizard2view.h"

12
keep/app/restorebackupwizard1view.ui
Unescape View File

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -78,7 +78,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -173,7 +173,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@ -189,7 +189,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">

14
keep/app/restorebackupwizard2view.ui
Unescape View File

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout50</cstring>
<cstring>layout50</cstring>
</property>
<hbox>
<property name="name">
@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -70,7 +70,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout49</cstring>
<cstring>layout49</cstring>
</property>
<vbox>
<property name="name">
@ -105,7 +105,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout48</cstring>
<cstring>layout48</cstring>
</property>
<vbox>
<property name="name">
@ -146,7 +146,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>160</height>

14
keep/app/restorebackupwizard3view.ui
Unescape View File

@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -73,7 +73,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@ -97,7 +97,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -105,7 +105,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -147,7 +147,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">

4
keep/common/backup.cpp
Unescape View File

@ -160,14 +160,14 @@ TQString Backup::htmlDesc()
if ( m_neverDelete )
del = i18n("Never delete");
else
del = i18n("%1 days").tqarg(m_deleteAfter);
del = i18n("%1 days").arg(m_deleteAfter);
if ( m_useCompression )
compression = i18n("Yes");
else
compression = i18n("No");
TQString html = "<p><b>" + i18n("Source directory:") + "</b><br>"
+ m_source + "<br><b>" + i18n("Destination directory:") + "</b><br>"
+ m_dest + "</p><p><b>" + i18n("Interval:") + "</b> " + i18n("%1 days").tqarg(m_interval)
+ m_dest + "</p><p><b>" + i18n("Interval:") + "</b> " + i18n("%1 days").arg(m_interval)
+ "<br><b>" + i18n("Delete after:") + "</b> " + del
+ "<br><b>" + i18n("Use compression:") + "</b> " + compression
+ "</p>";

4
keep/common/backuplistviewitem.cpp
Unescape View File

@ -46,12 +46,12 @@ void BackupListViewItem::setBackupText()
{
setText(0, TQDir(m_backup.source()).dirName() );
setText(1, TQDir(m_backup.dest()).dirName() );
setText(2, i18n("%1 days").tqarg(m_backup.interval()));
setText(2, i18n("%1 days").arg(m_backup.interval()));
TQString deleteAfter;
if ( m_backup.neverDelete() == true )
deleteAfter = i18n("Never");
else
deleteAfter = i18n("%1 days").tqarg(m_backup.deleteAfter());
deleteAfter = i18n("%1 days").arg(m_backup.deleteAfter());
setText(3, deleteAfter);
}

10
keep/common/listviewtooltip.h
Unescape View File

@ -49,8 +49,8 @@ inline void ListViewToolTip::maybeTip( const TQPoint& p ) {
if ( !item )
return;
const TQRect tqitemRect = listView->tqitemRect( item );
if ( !tqitemRect.isValid() )
const TQRect itemRect = listView->itemRect( item );
if ( !itemRect.isValid() )
return;
const int col = listView->header()->sectionAt( p.x() );
@ -61,16 +61,16 @@ inline void ListViewToolTip::maybeTip( const TQPoint& p ) {
if ( !headerRect.isValid() )
return;
const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width(), tqitemRect.height());
const TQRect cellRect( headerRect.left(), itemRect.top(),headerRect.width(), itemRect.height());
BackupListViewItem* backupItem = static_cast<BackupListViewItem*>(item);
TQString tipStr = backupItem->backup().htmlDesc();
/*
if( col == 0 )
tipStr = TQString( "Contents of this cell: <b>%1</b>" ).tqarg(item->text( 0 ) );
tipStr = TQString( "Contents of this cell: <b>%1</b>" ).arg(item->text( 0 ) );
else if( col == 1 )
tipStr = TQString( "Contents of that cell: <em>%1</em>" ).tqarg(item->text( 1 ) );
tipStr = TQString( "Contents of that cell: <em>%1</em>" ).arg(item->text( 1 ) );
else
tipStr = TQString( "Something else" );
*/

6
keep/common/rdbmanager.cpp
Unescape View File

@ -191,7 +191,7 @@ TQValueList<Backup> RDBManager::outdatedBackupList()
for ( it = backups.begin(); it != backups.end(); ++it )
{
TQDateTime last = lastIncrement(*it);
TQDate today = TQDate::tqcurrentDate();
TQDate today = TQDate::currentDate();
if ( last.date().daysTo(today) >= (*it).interval() )
{
kdDebug() << "Detected outdated backup: " << (*it).source() << endl;
@ -360,7 +360,7 @@ void RDBManager::removeOldIncrements(Backup backup)
// Gets the rdiff-backup process
KProcess *proc = RDBProcess();
// Adds the options
*proc << "--remove-older-than" << TQString("%1").tqarg(backup.deleteAfter()) + "D";
*proc << "--remove-older-than" << TQString("%1").arg(backup.deleteAfter()) + "D";
// Adds dest
*proc << backup.dest();
// Starts the process
@ -378,7 +378,7 @@ KProcess *RDBManager::RDBProcess(bool isNice,int niceLevel)
proc->setUseShell(true);
if ( isNice )
{
*proc << "nice" << "-n" << TQString("%1").tqarg(niceLevel);
*proc << "nice" << "-n" << TQString("%1").arg(niceLevel);
}
*proc << "rdiff-backup";

6
keep/kded/keepkded.cpp
Unescape View File

@ -56,7 +56,7 @@ void KeepKded::slotBackupError(Backup backup,TQString errorMessage)
{
if ( KeepSettings::notifyBackupError() )
{
KNotifyClient::userEvent(0,i18n("<p><b>An error occured making %1 backup:</b></p><p>%2</p>").tqarg(backup.source()).tqarg(errorMessage),16,4);
KNotifyClient::userEvent(0,i18n("<p><b>An error occured making %1 backup:</b></p><p>%2</p>").arg(backup.source()).arg(errorMessage),16,4);
}
log("Backup Error",backup.source(),errorMessage);
}
@ -65,14 +65,14 @@ void KeepKded::slotBackupSuccess(Backup backup)
{
if ( KeepSettings::notifyBackupSuccess() )
{
KNotifyClient::userEvent(0,i18n("<p><b>Backup %1 successfully backuped to %2</b></p>").tqarg(backup.source()).tqarg(backup.dest()),16,1);
KNotifyClient::userEvent(0,i18n("<p><b>Backup %1 successfully backuped to %2</b></p>").arg(backup.source()).arg(backup.dest()),16,1);
}
log("Backup Success",backup.source(),"Successfully backuped to: " + backup.dest() );
}
void KeepKded::log(TQString type,TQString backup,TQString message)
{
TQString logMessage = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + "\t" + type + "\t" + backup + "\t" + message;
TQString logMessage = TQDateTime::currentDateTime().toString(Qt::ISODate) + "\t" + type + "\t" + backup + "\t" + message;
TQFile file( m_logFilePath );
if ( file.open(IO_WriteOnly | IO_Append) )
{

Write Preview
Loading…