[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdereview/ktimechooser
From: Michael Leupold <lemma () confuego ! org>
Date: 2009-08-25 12:25:43
Message-ID: 1251203143.881663.27179.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1015391 by mleupold:
Remote KTimeEdit and everything related to it (stays in playground).
M +0 -2 CMakeLists.txt
M +3 -12 README
M +1 -117 example/example.ui
M +1 -25 example/main.cpp
M +1 -0 ktimechooser.cpp
M +1 -2 ktimechooser.h
D ktimeedit.cpp
D ktimeedit.h
D ktimeeditinternal.cpp
D ktimeeditinternal_p.h
M +0 -3 tests/CMakeLists.txt
D tests/ktimeeditinternaltest.cpp
D tests/ktimeeditinternaltest.h
D tests/ktimeedittest.cpp
D tests/ktimeedittest.h
--- trunk/kdereview/ktimechooser/CMakeLists.txt #1015390:1015391
@@ -10,8 +10,6 @@
set (ktimewidgets_LIB_SRCS
ktimevalidator.cpp
- ktimeeditinternal.cpp
- ktimeedit.cpp
ktimechooser.cpp
ktimechooser_p.cpp
)
--- trunk/kdereview/ktimechooser/README #1015390:1015391
@@ -1,22 +1,13 @@
-== KTimeWidgets ==
+== KTimeChooser ==
-This library is meant for inclusion in libkdeui. It provides several widgets
-for entering times as well as KTimeValidator which does most of the background
+This widget is meant for inclusion in libkdeui. It provides a combobox-style
+time chooser for entering times. KTimeValidator does most of the background
work.
== Classes ==
KTimeValidator - Inherited QValidator for times in locale-defined, 24-hour and
military format.
-KTimeEdit - Time entry widget with spin box buttons, meant as a replacement
- for QTimeEdit. In addition it can provide an additional
- combo box for choosing the value of the am/pm field.
-KTimeEditInternal - The spin box part of KTimeEdit (internal API)
KTimeChooser - A combo box style edit widget for times that lets the user
choose from pre-defined times
-== Note ==
-
-This library requires libkdeui to be patched with:
-http://reviewboard.kde.org/r/1065/
-... unless that's already merged.
\ No newline at end of file
--- trunk/kdereview/ktimechooser/example/example.ui #1015390:1015391
@@ -7,121 +7,11 @@
<x>0</x>
<y>0</y>
<width>566</width>
- <height>527</height>
+ <height>271</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>KTimeEdit</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="KTimeEdit" name="teWidget" native="true"/>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_3">
- <property name="title">
- <string>KTimeEdit properties</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QTimeEdit" name="teTimeEdit">
- <property name="displayFormat">
- <string>HH:mm:ss</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="teSetTime">
- <property name="text">
- <string>set time</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QCheckBox" name="teSeparateAmPm">
- <property name="text">
- <string>separate am/pm</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="teDuration">
- <property name="text">
- <string>duration</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="teIncludeSeconds">
- <property name="text">
- <string>include seconds</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QCheckBox" name="teAcceptableInput">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>acceptable input</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="teCheck">
- <property name="text">
- <string>check</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>KTimeChooser</string>
@@ -301,12 +191,6 @@
<extends>QComboBox</extends>
<header location="global">ktimechooser.h</header>
</customwidget>
- <customwidget>
- <class>KTimeEdit</class>
- <extends>QWidget</extends>
- <header location="global">ktimeedit.h</header>
- <container>1</container>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
--- trunk/kdereview/ktimechooser/example/main.cpp #1015390:1015391
@@ -19,7 +19,6 @@
*/
#include "../ktimechooser.h"
-#include "../ktimeedit.h"
#include <kaboutdata.h>
#include <kcomponentdata.h>
@@ -40,19 +39,13 @@
getAllProperties();
- connect(ui.teIncludeSeconds, SIGNAL(toggled(bool)), this, \
SLOT(setAllProperties()));
- connect(ui.teSeparateAmPm, SIGNAL(toggled(bool)), this, \
SLOT(setAllProperties()));
- connect(ui.teDuration, SIGNAL(toggled(bool)), this, \
SLOT(setAllProperties()));
connect(ui.tcEditable, SIGNAL(toggled(bool)), this, \
SLOT(setAllProperties()));
connect(ui.tcIncludeSeconds, SIGNAL(toggled(bool)), this, \
SLOT(setAllProperties()));
- connect(ui.teCheck, SIGNAL(clicked()), this, SLOT(getAllProperties()));
connect(ui.tcCheck, SIGNAL(clicked()), this, SLOT(getAllProperties()));
connect(ui.tcSetInterval, SIGNAL(clicked()), this, \
SLOT(setAllProperties()));
- connect(ui.teWidget, SIGNAL(timeChanged(QTime)), this, SLOT(getTeTime()));
connect(ui.tcWidget, SIGNAL(timeChanged(QTime)), this, SLOT(getTcTime()));
- connect(ui.teSetTime, SIGNAL(clicked()), this, SLOT(setTeTime()));
connect(ui.tcSetTime, SIGNAL(clicked()), this, SLOT(setTcTime()));
getTcTime();
@@ -66,9 +59,6 @@
void setAllProperties()
{
// lazy me...
- ui.teWidget->setIncludeSeconds(ui.teIncludeSeconds->isChecked());
- ui.teWidget->setSeparateAmPm(ui.teSeparateAmPm->isChecked());
- ui.teWidget->setDuration(ui.teDuration->isChecked());
ui.tcWidget->setEditable(ui.tcEditable->isChecked());
ui.tcWidget->setIncludeSeconds(ui.tcIncludeSeconds->isChecked());
ui.tcWidget->setInterval(ui.tcInterval->value());
@@ -76,32 +66,17 @@
void getAllProperties()
{
- ui.teIncludeSeconds->setChecked(ui.teWidget->includeSeconds());
- ui.teSeparateAmPm->setChecked(ui.teWidget->separateAmPm());
- ui.teDuration->setChecked(ui.teWidget->isDuration());
- ui.teAcceptableInput->setChecked(ui.teWidget->hasAcceptableInput());
-
ui.tcEditable->setChecked(ui.tcWidget->isEditable());
ui.tcIncludeSeconds->setChecked(ui.tcWidget->includeSeconds());
ui.tcAcceptableInput->setChecked(ui.tcWidget->hasAcceptableInput());
ui.tcInterval->setValue(ui.tcWidget->interval());
}
- void setTeTime()
- {
- ui.teWidget->setTime(ui.teTimeEdit->time());
- }
-
void setTcTime()
{
ui.tcWidget->setTime(ui.tcTimeEdit->time());
}
- void getTeTime()
- {
- ui.teTimeEdit->setTime(ui.teWidget->time());
- }
-
void getTcTime()
{
ui.tcTimeEdit->setTime(ui.tcWidget->time());
@@ -124,3 +99,4 @@
}
#include "main.moc"
+
--- trunk/kdereview/ktimechooser/ktimechooser.cpp #1015390:1015391
@@ -23,6 +23,7 @@
#include "ktimechooser_p.h"
#include "ktimevalidator_p.h"
+#include <QtGui/QKeyEvent>
#include <kcombobox.h>
#include <klineedit.h>
#include <kglobal.h>
--- trunk/kdereview/ktimechooser/ktimechooser.h #1015390:1015391
@@ -24,9 +24,8 @@
#include <QtCore/QString>
#include <QtCore/QTime>
-#include <QtGui/QKeyEvent>
+#include <QtGui/QWidget>
#include <klocale.h>
-#include <ktimeedit.h>
#include <kdeui_export.h>
--- trunk/kdereview/ktimechooser/tests/CMakeLists.txt #1015390:1015391
@@ -12,8 +12,5 @@
KDEUI_UNIT_TESTS (
ktimevalidatortest
ktimechoosertest
- ktimeedittest
)
-kde4_add_unit_test (ktimeeditinternaltest ktimeeditinternaltest.cpp \
../ktimeeditinternal.cpp)
-target_link_libraries (ktimeeditinternaltest ${KDE4_KDEUI_LIBRS} \
${QT_QTTEST_LIBRARY} ktimewidgets ${KDEWIN_LIBRARIES})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic