[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: Re: kdebase/kcontrol/screensaver
From: Gav Wood <gav () kde ! org>
Date: 2004-01-10 22:44:04
Message-ID: 200401102244.04768.gav () kde ! org
[Download RAW message or body]
> Sounds good. Maybe you can move "Auto-populate" aka "Add options" to a row
> of its own, that would put a little less stress on the horizontal width
> requirements.
>
> The germans will probably need this since they will without doubt translate
> it as "Automatischebevolkerungsauftragfunktion" or something equally
> lengthy ;-)
all is done and a patch is attached.
there are six diminishing string changes (Add Action -> Add) and three new
ones, resulting in a total of 9 strings that need updating.
on the subject of user docs, there are none yet. i have some in the works, but
i'm not sure if they'll be ready for the 3.2 release - is there not already a
freeze on doc commits? if not, when is the commit deadline? to be fair, there
are quite a few kde apps that don't have user docs yet (krandr, kwallet for
two).
gav
--
Gav Wood <gav@kde.org>
cogito ergo non satis bibivi
["kcmlirc.diff" (text/x-diff)]
Index: kcmlirc.cpp
===================================================================
RCS file: /home/kde/kdeutils/kdelirc/kcmlirc/kcmlirc.cpp,v
retrieving revision 1.34
diff -u -r1.34 kcmlirc.cpp
--- kcmlirc.cpp 6 Jan 2004 13:28:37 -0000 1.34
+++ kcmlirc.cpp 10 Jan 2004 22:31:27 -0000
@@ -401,6 +401,10 @@
IRKick_stub IRKick("irkick", "IRKick");
QStringList remotes = IRKick.remotes();
+ if(remotes.begin() == remotes.end())
+ theKCMLircBase->theMainLabel->setMaximumSize(32767, 32767);
+ else
+ theKCMLircBase->theMainLabel->setMaximumSize(0, 0);
for(QStringList::iterator i = remotes.begin(); i != remotes.end(); i++)
{ Mode mode = allModes.getMode(*i, "");
QListViewItem *a = new KListViewItem(theKCMLircBase->theModes, \
RemoteServer::remoteServer()->getRemoteName(*i), allModes.isDefault(mode) ? "Default" \
: "", mode.iconFile() == QString::null ? "" : "");
Index: kcmlircbase.ui
===================================================================
RCS file: /home/kde/kdeutils/kdelirc/kcmlirc/kcmlircbase.ui,v
retrieving revision 1.16
diff -u -r1.16 kcmlircbase.ui
--- kcmlircbase.ui 1 Sep 2003 16:58:51 -0000 1.16
+++ kcmlircbase.ui 10 Jan 2004 22:31:27 -0000
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.1.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KCMLircBase</class>
<author>Gav Wood</author>
<widget class="QWidget">
@@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>854</width>
- <height>542</height>
+ <width>469</width>
+ <height>326</height>
</rect>
</property>
<property name="caption">
@@ -37,13 +37,50 @@
<attribute name="title">
<string>Controller Functions</string>
</attribute>
- <grid>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QSplitter" row="0" column="0">
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>theMainLabel</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="paletteForegroundColor">
+ <color>
+ <red>138</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </property>
+ <property name="font">
+ <font>
+ <bold>1</bold>
+ </font>
+ </property>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
+ </property>
+ <property name="margin">
+ <number>1</number>
+ </property>
+ <property name="text">
+ <string>There are currently no remote controls \
available. You must first set up LIRC correctly; see www.lirc.org for more \
information.</string> + </property>
+ <property name="alignment">
+ <set>WordBreak|AlignTop</set>
+ </property>
+ </widget>
+ <widget class="QSplitter">
<property name="name">
- <cstring>splitter8</cstring>
+ <cstring>splitter4</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
@@ -59,6 +96,14 @@
<property name="margin">
<number>0</number>
</property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>theRemotesLabel</cstring>
+ </property>
+ <property name="text">
+ <string>Remote controls and Modes:</string>
+ </property>
+ </widget>
<widget class="KListView">
<column>
<property name="text">
@@ -128,7 +173,10 @@
<bool>false</bool>
</property>
<property name="text">
- <string>&Add Mode...</string>
+ <string>&Add...</string>
+ </property>
+ <property name="accel">
+ <string>Alt+A</string>
</property>
</widget>
<widget class="KPushButton">
@@ -139,7 +187,10 @@
<bool>false</bool>
</property>
<property name="text">
- <string>E&dit Mode</string>
+ <string>&Edit...</string>
+ </property>
+ <property name="accel">
+ <string>Alt+E</string>
</property>
</widget>
<widget class="KPushButton">
@@ -150,7 +201,10 @@
<bool>false</bool>
</property>
<property name="text">
- <string>&Remove Mode</string>
+ <string>&Remove</string>
+ </property>
+ <property name="accel">
+ <string>Alt+R</string>
</property>
</widget>
</hbox>
@@ -159,7 +213,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout46</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -255,7 +309,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout45</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -273,61 +327,83 @@
</property>
<property name="sizeHint">
<size>
- <width>110</width>
+ <width>240</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="KPushButton">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>theAddActions</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Add Ac&tions...</string>
- </property>
- </widget>
- <widget class="KPushButton">
- <property name="name">
- <cstring>theAddAction</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>A&dd Action...</string>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>theEditAction</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>&Edit Action...</string>
- </property>
- </widget>
- <widget class="KPushButton">
- <property name="name">
- <cstring>theRemoveAction</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Re&move Action</string>
+ <cstring>layout6</cstring>
</property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="KPushButton" row="0" \
column="0" rowspan="1" colspan="3"> + \
<property name="name"> + \
<cstring>theAddActions</cstring> + \
</property> + <property \
name="enabled"> + \
<bool>false</bool> + </property>
+ <property name="text">
+ \
<string>Auto-Populate...</string> + \
</property> + <property \
name="accel"> + \
<string></string> + </property>
+ </widget>
+ <widget class="KPushButton" row="1" \
column="0"> + <property \
name="name"> + \
<cstring>theAddAction</cstring> + \
</property> + <property \
name="enabled"> + \
<bool>false</bool> + </property>
+ <property name="text">
+ <string>A&dd...</string>
+ </property>
+ <property name="accel">
+ <string>Alt+D</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" row="1" \
column="1"> + <property \
name="name"> + \
<cstring>theEditAction</cstring> + \
</property> + <property \
name="enabled"> + \
<bool>false</bool> + </property>
+ <property name="text">
+ \
<string>Ed&it...</string> + \
</property> + <property \
name="accel"> + \
<string>Alt+I</string> + \
</property> + </widget>
+ <widget class="KPushButton" row="1" \
column="2"> + <property \
name="name"> + \
<cstring>theRemoveAction</cstring> + \
</property> + <property \
name="enabled"> + \
<bool>false</bool> + </property>
+ <property name="text">
+ <string>Re&move</string>
+ </property>
+ <property name="accel">
+ <string>Alt+M</string>
+ </property>
+ </widget>
+ </grid>
</widget>
</hbox>
</widget>
</vbox>
</widget>
</widget>
- </grid>
+ </vbox>
</widget>
<widget class="QWidget">
<property name="name">
@@ -433,4 +509,16 @@
<function access="private" specifier="non virtual">init()</function>
</functions>
<layoutdefaults spacing="6" margin="11"/>
+<includehints>
+ <includehint>klistview.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>klistview.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>klistview.h</includehint>
+ <includehint>klistview.h</includehint>
+</includehints>
</UI>
[prev in list] [next in list] [prev in thread] [next in thread]