TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

More buxfixes

Browse Source 
Fixed Kicker loaing problem
Additional KDE->Trinity reference conversions


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176571 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent a56441c546
commit eae76faade
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
kicker/kicker/core/extensionSettings.kcfg
Unescape View File

@ -106,7 +106,7 @@
<entry name="CustomSize" type="Int" > <entry name="CustomSize" type="Int" >
<label>Custom size</label> <label>Custom size</label>
<default>58</default> <default>30</default>
<min>16</min> <min>16</min>
</entry> </entry>

6
kicker/kicker/panel.desktop
Unescape View File

@ -79,8 +79,8 @@ Name[zh_CN]=Trinity 面板
Name[zh_TW]=Trinity 面板 Name[zh_TW]=Trinity 面板
Name[zu]=Iwindi lemininingwane le-Trinity Name[zu]=Iwindi lemininingwane le-Trinity
X-DCOP-ServiceType=wait X-DCOP-ServiceType=wait
X-Trinity-autostart-after=kdesktop X-KDE-autostart-after=kdesktop
DocPath=kicker/index.html DocPath=kicker/index.html
Type=Service Type=Service
OnlyShowIn=Trinity; OnlyShowIn=KDE;
X-Trinity-autostart-phase=0 X-KDE-autostart-phase=0

8
kpersonalizer/kcountrypagedlg.ui
Unescape View File

@ -77,9 +77,9 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;p&gt;This Personalizer will help you configure the basic setup of your KDE desktop in five quick, easy steps. You can set things like your country (for date and time formats, etc.), language, desktop behavior and more.&lt;/p&gt; <string>&lt;p&gt;This Personalizer will help you configure the basic setup of your Trinity desktop in five quick, easy steps. You can set things like your country (for date and time formats, etc.), language, desktop behavior and more.&lt;/p&gt;
&lt;p&gt;You will be able to change all the settings later using the KDE Control Center. You may choose to postpone your personalization until later by clicking on &lt;b&gt;Skip Wizard&lt;/b&gt;. Any changes made so far, will then be reversed, except for the country and language settings. However, new users are encouraged to use this simple method.&lt;/p&gt; &lt;p&gt;You will be able to change all the settings later using the Trinity Control Center. You may choose to postpone your personalization until later by clicking on &lt;b&gt;Skip Wizard&lt;/b&gt;. Any changes made so far, will then be reversed, except for the country and language settings. However, new users are encouraged to use this simple method.&lt;/p&gt;
&lt;p&gt;If you already like your KDE configuration and wish to quit the Wizard, click &lt;b&gt;Skip Wizard&lt;/b&gt;, then &lt;b&gt;Quit&lt;/b&gt;.&lt;/p&gt;</string> &lt;p&gt;If you already like your Trinity configuration and wish to quit the Wizard, click &lt;b&gt;Skip Wizard&lt;/b&gt;, then &lt;b&gt;Quit&lt;/b&gt;.&lt;/p&gt;</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
@ -97,7 +97,7 @@
<cstring>txt_welcome</cstring> <cstring>txt_welcome</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;h3&gt;Welcome to KDE %VERSION%!&lt;/h3&gt;</string> <string>&lt;h3&gt;Welcome to Trinity %VERSION%!&lt;/h3&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLayoutWidget" row="4" column="1"> <widget class="QLayoutWidget" row="4" column="1">

2
kpersonalizer/keyecandypagedlg.ui
Unescape View File

@ -60,7 +60,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;P&gt;KDE offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. &lt;/P&gt; <string>&lt;P&gt;Trinity offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. &lt;/P&gt;
If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive.</string> If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive.</string>
</property> </property>
<property name="alignment"> <property name="alignment">

6
kpersonalizer/kospage.cpp
Unescape View File

@ -38,7 +38,7 @@
KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) { KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) {
px_osSidebar->setPixmap(UserIcon("step2.png")); px_osSidebar->setPixmap(UserIcon("step2.png"));
// initialize the textview with the default description - KDE of course // initialize the textview with the default description - Trinity of course
slotKDEDescription(); slotKDEDescription();
// Set the configfiles // Set the configfiles
cglobal = new KConfig("kdeglobals"); cglobal = new KConfig("kdeglobals");
@ -353,7 +353,7 @@ void KOSPage::slotKDEDescription(){
"<b>Titlebar double-click:</b> <i>Shade window</i><br>" "<b>Titlebar double-click:</b> <i>Shade window</i><br>"
"<b>Mouse selection:</b> <i>Single click</i><br>" "<b>Mouse selection:</b> <i>Single click</i><br>"
"<b>Application startup notification:</b> <i>busy cursor</i><br>" "<b>Application startup notification:</b> <i>busy cursor</i><br>"
"<b>Keyboard scheme:</b> <i>KDE default</i><br>" "<b>Keyboard scheme:</b> <i>Trinity default</i><br>"
)); ));
} }
@ -394,7 +394,7 @@ void KOSPage::slotMacDescription(){
} }
/** retrieves the user's local values. In case he doesn't have these set, use the default values of KDE */ /** retrieves the user's local values. In case he doesn't have these set, use the default values of Trinity */
void KOSPage::getUserDefaults(){ void KOSPage::getUserDefaults(){
ckcmdisplay->setGroup("KDE"); ckcmdisplay->setGroup("KDE");
b_MacMenuBar = ckcmdisplay->readBoolEntry("macStyle", false); b_MacMenuBar = ckcmdisplay->readBoolEntry("macStyle", false);

6
kpersonalizer/kospagedlg.ui
Unescape View File

@ -76,7 +76,7 @@
<cstring>rb_kde</cstring> <cstring>rb_kde</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>KDE (TM)</string> <string>Trinity (TM)</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
@ -123,7 +123,7 @@
<property name="text"> <property name="text">
<string>&lt;b&gt;System Behavior&lt;/b&gt;&lt;br&gt; <string>&lt;b&gt;System Behavior&lt;/b&gt;&lt;br&gt;
Graphical User Interfaces behave differently on various Operating Systems. Graphical User Interfaces behave differently on various Operating Systems.
KDE allows you to customize its behavior according to your needs.</string> Trinity allows you to customize its behavior according to your needs.</string>
</property> </property>
</widget> </widget>
<spacer row="1" column="1"> <spacer row="1" column="1">
@ -165,7 +165,7 @@ KDE allows you to customize its behavior according to your needs.</string>
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>For motion impaired users, KDE provides keyboard gestures to activate special keyboard settings.</string> <string>For motion impaired users, Trinity provides keyboard gestures to activate special keyboard settings.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>

6
kpersonalizer/kpersonalizer.cpp
Unescape View File

@ -150,7 +150,7 @@ bool KPersonalizer::askClose(){
TQString text; TQString text;
if (currentPage()==countrypage) { if (currentPage()==countrypage) {
text = i18n("<p>Are you sure you want to quit the Desktop Settings Wizard?</p>" text = i18n("<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
"<p>The Desktop Settings Wizard helps you to configure the KDE desktop to your personal liking.</p>" "<p>The Desktop Settings Wizard helps you to configure the Trinity desktop to your personal liking.</p>"
"<p>Click <b>Cancel</b> to return and finish your setup.</p>"); "<p>Click <b>Cancel</b> to return and finish your setup.</p>");
} else { } else {
text = i18n("<p>Are you sure you want to quit the Desktop Settings Wizard?</p>" text = i18n("<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
@ -188,7 +188,7 @@ void KPersonalizer::accept(){
exit(0); exit(0);
} }
/** calls all save functions after resetting all features/ OS/ theme selections to KDE default */ /** calls all save functions after resetting all features/ OS/ theme selections to Trinity default */
void KPersonalizer::setDefaults(){ void KPersonalizer::setDefaults(){
// KCountryPage: The user may need his native language anyway // KCountryPage: The user may need his native language anyway
if(os_dirty) if(os_dirty)
@ -223,7 +223,7 @@ void KPersonalizer::restarted(){
showPage(ospage); showPage(ospage);
} }
/** when kpersonalizer is started before KDE session, it doesn't /** when kpersonalizer is started before Trinity session, it doesn't
offer a button for starting KControl, it also doesn't restart offer a button for starting KControl, it also doesn't restart
itself automatically and only exits with exitcode 1 */ itself automatically and only exits with exitcode 1 */
void KPersonalizer::setBeforeSession(){ void KPersonalizer::setBeforeSession(){

6
kpersonalizer/kpersonalizer.h
Unescape View File

@ -50,12 +50,12 @@ public:
/** this session is restarted, so we want to start with ospage */ /** this session is restarted, so we want to start with ospage */
void restarted(); void restarted();
/** KPersonalizer is running before KDE is started */ /** KPersonalizer is running before Trinity is started */
static void setBeforeSession(); static void setBeforeSession();
static bool beforeSession() { return before_session; } static bool beforeSession() { return before_session; }
public slots: // Public slots public slots: // Public slots
/** calls all save functions after resetting all features/ OS/ theme selections to KDE default */ /** calls all save functions after resetting all features/ OS/ theme selections to Trinity default */
void setDefaults(); void setDefaults();
/** the cancel button is connected to the reject() slot of TQDialog, /** the cancel button is connected to the reject() slot of TQDialog,
* so we have to reimplement this here to add a dialogbox to * so we have to reimplement this here to add a dialogbox to
@ -88,7 +88,7 @@ protected slots: // Public slots
void slotRestart(); void slotRestart();
protected: // Protected methods protected: // Protected methods
// the close button on the titlebar sets e->accept() which we don´t want. // the close button on the titlebar sets e->accept() which we don<EFBFBD>t want.
virtual void closeEvent(TQCloseEvent*); virtual void closeEvent(TQCloseEvent*);
bool askClose(); bool askClose();
}; };

6
kpersonalizer/krefinepagedlg.ui
Unescape View File

@ -78,7 +78,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>You can refine the settings you made by starting the KDE Control Center by choosing the entry &lt;b&gt;Control Center&lt;/b&gt; in the K menu.</string> <string>You can refine the settings you made by starting the Trinity Control Center by choosing the entry &lt;b&gt;Control Center&lt;/b&gt; in the K menu.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>WordBreak|AlignTop|AlignLeft</set> <set>WordBreak|AlignTop|AlignLeft</set>
@ -130,7 +130,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>You can also start the KDE Control Center using the button below.</string> <string>You can also start the Trinity Control Center using the button below.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
@ -200,7 +200,7 @@
<cstring>pb_kcontrol</cstring> <cstring>pb_kcontrol</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Launch KDE Control Center</string> <string>&amp;Launch Trinity Control Center</string>
</property> </property>
</widget> </widget>
<spacer> <spacer>

2
kpersonalizer/main.cpp
Unescape View File

@ -29,7 +29,7 @@ static const char description[] = I18N_NOOP("KPersonalizer");
static KCmdLineOptions options[] = static KCmdLineOptions options[] =
{ {
{ "r", I18N_NOOP("Personalizer is restarted by itself"), 0 }, { "r", I18N_NOOP("Personalizer is restarted by itself"), 0 },
{ "before-session", I18N_NOOP("Personalizer is running before KDE session"), 0 }, { "before-session", I18N_NOOP("Personalizer is running before Trinity session"), 0 },
KCmdLineLastOption KCmdLineLastOption
}; };

BIN
kpersonalizer/pics/step1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Write Preview
Loading…
Cancel
Save