[tdebase][master,r14.0.x] e47bab3f,aa514973,2bcf7d84,c4831a01,3a1b88b2,c17f71ce,022857df

kdesktop/lock/main.cc

diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc

index 4960b8d..114ce7e 100644

--- a/kdesktop/lock/main.cc

+++ b/kdesktop/lock/main.cc

@@ -243,6 +243,7 @@

 		sigset_t orig_mask;

 		// Block reception of all signals in this thread

+		sigfillset(&new_mask);

 		sigprocmask(SIG_BLOCK, &new_mask, NULL);

 		signalled_forcelock = FALSE;

kcontrol/pics/cr16-app-kcmkicker.png

diff --git a/kcontrol/pics/cr16-app-kcmkicker.png b/kcontrol/pics/cr16-app-kcmkicker.png

index 2331a29..6812637 100644

--- a/kcontrol/pics/cr16-app-kcmkicker.png

+++ b/kcontrol/pics/cr16-app-kcmkicker.png

Binary files differ

kcontrol/pics/cr22-app-kcmkicker.png

diff --git a/kcontrol/pics/cr22-app-kcmkicker.png b/kcontrol/pics/cr22-app-kcmkicker.png

index dbfa1e5..7a3b5c6 100644

--- a/kcontrol/pics/cr22-app-kcmkicker.png

+++ b/kcontrol/pics/cr22-app-kcmkicker.png

Binary files differ

kcontrol/pics/cr32-app-kcmkicker.png

diff --git a/kcontrol/pics/cr32-app-kcmkicker.png b/kcontrol/pics/cr32-app-kcmkicker.png

index 12b478e..5a8c1d4 100644

--- a/kcontrol/pics/cr32-app-kcmkicker.png

+++ b/kcontrol/pics/cr32-app-kcmkicker.png

Binary files differ

kcontrol/pics/cr48-app-kcmkicker.png

diff --git a/kcontrol/pics/cr48-app-kcmkicker.png b/kcontrol/pics/cr48-app-kcmkicker.png

index 90fae4e..613dd67 100644

--- a/kcontrol/pics/cr48-app-kcmkicker.png

+++ b/kcontrol/pics/cr48-app-kcmkicker.png

Binary files differ

kicker/data/icons/cr16-app-kicker.png

diff --git a/kicker/data/icons/cr16-app-kicker.png b/kicker/data/icons/cr16-app-kicker.png

index 2331a29..6812637 100644

--- a/kicker/data/icons/cr16-app-kicker.png

+++ b/kicker/data/icons/cr16-app-kicker.png

Binary files differ

kicker/data/icons/cr22-app-kicker.png

diff --git a/kicker/data/icons/cr22-app-kicker.png b/kicker/data/icons/cr22-app-kicker.png

index 136cf12..7a3b5c6 100644

--- a/kicker/data/icons/cr22-app-kicker.png

+++ b/kicker/data/icons/cr22-app-kicker.png

Binary files differ

kicker/data/icons/cr32-app-kicker.png

diff --git a/kicker/data/icons/cr32-app-kicker.png b/kicker/data/icons/cr32-app-kicker.png

index 7eb60f7..5a8c1d4 100644

--- a/kicker/data/icons/cr32-app-kicker.png

+++ b/kicker/data/icons/cr32-app-kicker.png

Binary files differ

kicker/data/icons/cr48-app-kicker.png

diff --git a/kicker/data/icons/cr48-app-kicker.png b/kicker/data/icons/cr48-app-kicker.png

index 90fae4e..613dd67 100644

--- a/kicker/data/icons/cr48-app-kicker.png

+++ b/kicker/data/icons/cr48-app-kicker.png

Binary files differ

klipper/configdialog.cpp

diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp

index 66fce6f..ad1ad93 100644

--- a/klipper/configdialog.cpp

+++ b/klipper/configdialog.cpp

@@ -229,7 +229,7 @@

     listView = new ListView( configWidget, this, "list view" );

     lblAction->setBuddy( listView );

-    listView->addColumn( i18n("Regular Expression (see http://doc.trolltech.com/tqregexp.html#details)") );

+    listView->addColumn( i18n("Regular Expression (see https://trinitydesktop.org/docs/qt3/qregexp.html#details)") );

     listView->addColumn( i18n("Description") );

     listView->setRenameable(0);

konqueror/keditbookmarks/actionsimpl.cpp

diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp

index 595e910..1313ccd 100644

--- a/konqueror/keditbookmarks/actionsimpl.cpp

+++ b/konqueror/keditbookmarks/actionsimpl.cpp

@@ -187,7 +187,7 @@

         i18n("Import &Galeon Bookmarks..."), 0,

         TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");

     (void) new TDEAction(

-        i18n("Import &KDE2/KDE3 Bookmarks..."), 0,

+        i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0,

         TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");

     (void) new TDEAction(

         i18n("Import &IE Bookmarks..."), 0,

konqueror/keditbookmarks/importers.cpp

diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp

index ec0d5e2..e809a12 100644

--- a/konqueror/keditbookmarks/importers.cpp

+++ b/konqueror/keditbookmarks/importers.cpp

@@ -185,7 +185,7 @@

 TQString KDE2ImportCommand::requestFilename() const {

     return KFileDialog::getOpenFileName(

             locateLocal("data", "konqueror"),

-            i18n("*.xml|KDE Bookmark Files (*.xml)"));

+            i18n("*.xml|TDE Bookmark Files (*.xml)"));

 /* -------------------------------------- */

kpersonalizer/tdestylepage.cpp

diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp

index 4995460..5c85f40 100644

--- a/kpersonalizer/tdestylepage.cpp

+++ b/kpersonalizer/tdestylepage.cpp

@@ -56,8 +56,8 @@

 	kde->setText( 1, i18n( "TDE default style" ) );

 	classic = new TQListViewItem( klv_styles);

-	classic->setText( 0, i18n( "KDE Classic" ) );

-	classic->setText( 1, i18n( "Classic KDE style" ) );

+	classic->setText( 0, i18n( "TDE Classic" ) );

+	classic->setText( 1, i18n( "Classic TDE style" ) );

 	keramik = new TQListViewItem( klv_styles );

 	keramik->setText( 0, i18n( "Keramik" ) );

klipper/configdialog.cpp

diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp

index 66fce6f..ad1ad93 100644

--- a/klipper/configdialog.cpp

+++ b/klipper/configdialog.cpp

@@ -229,7 +229,7 @@

     listView = new ListView( configWidget, this, "list view" );

     lblAction->setBuddy( listView );

-    listView->addColumn( i18n("Regular Expression (see http://doc.trolltech.com/tqregexp.html#details)") );

+    listView->addColumn( i18n("Regular Expression (see https://trinitydesktop.org/docs/qt3/qregexp.html#details)") );

     listView->addColumn( i18n("Description") );

     listView->setRenameable(0);

konqueror/keditbookmarks/actionsimpl.cpp

diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp

index b1b7c8c..d35794d 100644

--- a/konqueror/keditbookmarks/actionsimpl.cpp

+++ b/konqueror/keditbookmarks/actionsimpl.cpp

@@ -187,7 +187,7 @@

         i18n("Import &Galeon Bookmarks..."), 0,

         TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");

     (void) new TDEAction(

-        i18n("Import &KDE2/KDE3 Bookmarks..."), 0,

+        i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0,

         TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");

     (void) new TDEAction(

         i18n("Import &IE Bookmarks..."), 0,

konqueror/keditbookmarks/importers.cpp

diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp

index ec0d5e2..e809a12 100644

--- a/konqueror/keditbookmarks/importers.cpp

+++ b/konqueror/keditbookmarks/importers.cpp

@@ -185,7 +185,7 @@

 TQString KDE2ImportCommand::requestFilename() const {

     return KFileDialog::getOpenFileName(

             locateLocal("data", "konqueror"),

-            i18n("*.xml|KDE Bookmark Files (*.xml)"));

+            i18n("*.xml|TDE Bookmark Files (*.xml)"));

 /* -------------------------------------- */

kpersonalizer/tdestylepage.cpp

diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp

index 4995460..5c85f40 100644

--- a/kpersonalizer/tdestylepage.cpp

+++ b/kpersonalizer/tdestylepage.cpp

@@ -56,8 +56,8 @@

 	kde->setText( 1, i18n( "TDE default style" ) );

 	classic = new TQListViewItem( klv_styles);

-	classic->setText( 0, i18n( "KDE Classic" ) );

-	classic->setText( 1, i18n( "Classic KDE style" ) );

+	classic->setText( 0, i18n( "TDE Classic" ) );

+	classic->setText( 1, i18n( "Classic TDE style" ) );

 	keramik = new TQListViewItem( klv_styles );

 	keramik->setText( 0, i18n( "Keramik" ) );

e47bab3f	2019-07-19 13:51:25	Slávek Banko
kdesktop: Add missing initialization of sigset_t in kdesktop_lock. This resolves bug 3025. Signed-off-by: Slávek Banko <slavek.banko@...> Signed-off-by: Michele Calgaro <michele.calgaro@...>
M kdesktop/lock/main.cc
kdesktop/lock/main.cc diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 4960b8d..114ce7e 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -243,6 +243,7 @@ sigset_t orig_mask; // Block reception of all signals in this thread + sigfillset(&new_mask); sigprocmask(SIG_BLOCK, &new_mask, NULL); signalled_forcelock = FALSE;
aa514973	2019-07-21 13:51:37	Chris
Add consistent and modern TDE kicker icon. Signed-off-by: Chris <xchrisx@...>
M kcontrol/pics/cr16-app-kcmkicker.png M kcontrol/pics/cr22-app-kcmkicker.png M kcontrol/pics/cr32-app-kcmkicker.png M kcontrol/pics/cr48-app-kcmkicker.png M kicker/data/icons/cr16-app-kicker.png M kicker/data/icons/cr22-app-kicker.png M kicker/data/icons/cr32-app-kicker.png M kicker/data/icons/cr48-app-kicker.png
kcontrol/pics/cr16-app-kcmkicker.png diff --git a/kcontrol/pics/cr16-app-kcmkicker.png b/kcontrol/pics/cr16-app-kcmkicker.png index 2331a29..6812637 100644 --- a/kcontrol/pics/cr16-app-kcmkicker.png +++ b/kcontrol/pics/cr16-app-kcmkicker.png Binary files differ kcontrol/pics/cr22-app-kcmkicker.png diff --git a/kcontrol/pics/cr22-app-kcmkicker.png b/kcontrol/pics/cr22-app-kcmkicker.png index dbfa1e5..7a3b5c6 100644 --- a/kcontrol/pics/cr22-app-kcmkicker.png +++ b/kcontrol/pics/cr22-app-kcmkicker.png Binary files differ kcontrol/pics/cr32-app-kcmkicker.png diff --git a/kcontrol/pics/cr32-app-kcmkicker.png b/kcontrol/pics/cr32-app-kcmkicker.png index 12b478e..5a8c1d4 100644 --- a/kcontrol/pics/cr32-app-kcmkicker.png +++ b/kcontrol/pics/cr32-app-kcmkicker.png Binary files differ kcontrol/pics/cr48-app-kcmkicker.png diff --git a/kcontrol/pics/cr48-app-kcmkicker.png b/kcontrol/pics/cr48-app-kcmkicker.png index 90fae4e..613dd67 100644 --- a/kcontrol/pics/cr48-app-kcmkicker.png +++ b/kcontrol/pics/cr48-app-kcmkicker.png Binary files differ kicker/data/icons/cr16-app-kicker.png diff --git a/kicker/data/icons/cr16-app-kicker.png b/kicker/data/icons/cr16-app-kicker.png index 2331a29..6812637 100644 --- a/kicker/data/icons/cr16-app-kicker.png +++ b/kicker/data/icons/cr16-app-kicker.png Binary files differ kicker/data/icons/cr22-app-kicker.png diff --git a/kicker/data/icons/cr22-app-kicker.png b/kicker/data/icons/cr22-app-kicker.png index 136cf12..7a3b5c6 100644 --- a/kicker/data/icons/cr22-app-kicker.png +++ b/kicker/data/icons/cr22-app-kicker.png Binary files differ kicker/data/icons/cr32-app-kicker.png diff --git a/kicker/data/icons/cr32-app-kicker.png b/kicker/data/icons/cr32-app-kicker.png index 7eb60f7..5a8c1d4 100644 --- a/kicker/data/icons/cr32-app-kicker.png +++ b/kicker/data/icons/cr32-app-kicker.png Binary files differ kicker/data/icons/cr48-app-kicker.png diff --git a/kicker/data/icons/cr48-app-kicker.png b/kicker/data/icons/cr48-app-kicker.png index 90fae4e..613dd67 100644 --- a/kicker/data/icons/cr48-app-kicker.png +++ b/kicker/data/icons/cr48-app-kicker.png Binary files differ
2bcf7d84	2019-07-21 13:54:03	Chris
Fix outdated Qt documentation to point to own TQt documentation. Signed-off-by: Chris <xchrisx@...>
M klipper/configdialog.cpp
klipper/configdialog.cpp diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 66fce6f..ad1ad93 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -229,7 +229,7 @@ listView = new ListView( configWidget, this, "list view" ); lblAction->setBuddy( listView ); - listView->addColumn( i18n("Regular Expression (see http://doc.trolltech.com/tqregexp.html#details)") ); + listView->addColumn( i18n("Regular Expression (see https://trinitydesktop.org/docs/qt3/qregexp.html#details)") ); listView->addColumn( i18n("Description") ); listView->setRenameable(0);
c4831a01	2019-07-22 22:03:45	Chris
Fix more remaining brandings in tdebase. Signed-off-by: Chris <xchrisx@...>
M konqueror/keditbookmarks/actionsimpl.cpp M konqueror/keditbookmarks/importers.cpp M kpersonalizer/tdestylepage.cpp
konqueror/keditbookmarks/actionsimpl.cpp diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 595e910..1313ccd 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -187,7 +187,7 @@ i18n("Import &Galeon Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new TDEAction( - i18n("Import &KDE2/KDE3 Bookmarks..."), 0, + i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, konqueror/keditbookmarks/importers.cpp diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp index ec0d5e2..e809a12 100644 --- a/konqueror/keditbookmarks/importers.cpp +++ b/konqueror/keditbookmarks/importers.cpp @@ -185,7 +185,7 @@ TQString KDE2ImportCommand::requestFilename() const { return KFileDialog::getOpenFileName( locateLocal("data", "konqueror"), - i18n(".xml\|KDE Bookmark Files (.xml)")); + i18n(".xml\|TDE Bookmark Files (.xml)")); } /* -------------------------------------- */ kpersonalizer/tdestylepage.cpp diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp index 4995460..5c85f40 100644 --- a/kpersonalizer/tdestylepage.cpp +++ b/kpersonalizer/tdestylepage.cpp @@ -56,8 +56,8 @@ kde->setText( 1, i18n( "TDE default style" ) ); classic = new TQListViewItem( klv_styles); - classic->setText( 0, i18n( "KDE Classic" ) ); - classic->setText( 1, i18n( "Classic KDE style" ) ); + classic->setText( 0, i18n( "TDE Classic" ) ); + classic->setText( 1, i18n( "Classic TDE style" ) ); keramik = new TQListViewItem( klv_styles ); keramik->setText( 0, i18n( "Keramik" ) );

c17f71ce	2019-07-21 13:55:04	Chris
Fix outdated Qt documentation to point to own TQt documentation. Signed-off-by: Chris <xchrisx@...> (cherry picked from commit 2bcf7d84fc0a8c11f82c1a027d907695f3e8068b)
M klipper/configdialog.cpp
klipper/configdialog.cpp diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 66fce6f..ad1ad93 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -229,7 +229,7 @@ listView = new ListView( configWidget, this, "list view" ); lblAction->setBuddy( listView ); - listView->addColumn( i18n("Regular Expression (see http://doc.trolltech.com/tqregexp.html#details)") ); + listView->addColumn( i18n("Regular Expression (see https://trinitydesktop.org/docs/qt3/qregexp.html#details)") ); listView->addColumn( i18n("Description") ); listView->setRenameable(0);
022857df	2019-07-24 01:21:15	Chris
Fix more remaining brandings in tdebase. Signed-off-by: Chris <xchrisx@...> (cherry picked from commit c4831a01df0a3df0b6eebf62f90c82fe2e93ada7)
M konqueror/keditbookmarks/actionsimpl.cpp M konqueror/keditbookmarks/importers.cpp M kpersonalizer/tdestylepage.cpp
konqueror/keditbookmarks/actionsimpl.cpp diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index b1b7c8c..d35794d 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -187,7 +187,7 @@ i18n("Import &Galeon Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new TDEAction( - i18n("Import &KDE2/KDE3 Bookmarks..."), 0, + i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, konqueror/keditbookmarks/importers.cpp diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp index ec0d5e2..e809a12 100644 --- a/konqueror/keditbookmarks/importers.cpp +++ b/konqueror/keditbookmarks/importers.cpp @@ -185,7 +185,7 @@ TQString KDE2ImportCommand::requestFilename() const { return KFileDialog::getOpenFileName( locateLocal("data", "konqueror"), - i18n(".xml\|KDE Bookmark Files (.xml)")); + i18n(".xml\|TDE Bookmark Files (.xml)")); } /* -------------------------------------- */ kpersonalizer/tdestylepage.cpp diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp index 4995460..5c85f40 100644 --- a/kpersonalizer/tdestylepage.cpp +++ b/kpersonalizer/tdestylepage.cpp @@ -56,8 +56,8 @@ kde->setText( 1, i18n( "TDE default style" ) ); classic = new TQListViewItem( klv_styles); - classic->setText( 0, i18n( "KDE Classic" ) ); - classic->setText( 1, i18n( "Classic KDE style" ) ); + classic->setText( 0, i18n( "TDE Classic" ) ); + classic->setText( 1, i18n( "Classic TDE style" ) ); keramik = new TQListViewItem( klv_styles ); keramik->setText( 0, i18n( "Keramik" ) );

Branch: master

kdesktop/lock/main.cc

kcontrol/pics/cr16-app-kcmkicker.png

kcontrol/pics/cr22-app-kcmkicker.png

kcontrol/pics/cr32-app-kcmkicker.png

kcontrol/pics/cr48-app-kcmkicker.png

kicker/data/icons/cr16-app-kicker.png

kicker/data/icons/cr22-app-kicker.png

kicker/data/icons/cr32-app-kicker.png

kicker/data/icons/cr48-app-kicker.png

klipper/configdialog.cpp

konqueror/keditbookmarks/actionsimpl.cpp

konqueror/keditbookmarks/importers.cpp

kpersonalizer/tdestylepage.cpp

Branch: r14.0.x

klipper/configdialog.cpp

konqueror/keditbookmarks/actionsimpl.cpp

konqueror/keditbookmarks/importers.cpp

kpersonalizer/tdestylepage.cpp