[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    koffice/kexi/formeditor
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2005-10-14 10:34:33
Message-ID: 1129286073.026626.7588.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 470558 by staniek:


Forms
- It was not possible to change the tab order of
widgets in the Edit Tab Order dialog with keyboard.


CCMAIL: garycramblitt@comcast.net
CCMAIL: koffice-devel@kde.org



 M  +2 -1      objecttreeview.cpp  
 M  +21 -26    tabstopdialog.cpp  
 M  +4 -6      tabstopdialog.h  


--- trunk/koffice/kexi/formeditor/objecttreeview.cpp #470557:470558
@@ -162,7 +162,8 @@
 {
 	m_form = 0;
 	addColumn(i18n("Name"), 130);
-	addColumn(i18n("Class"), 100);
+//	addColumn(i18n("Class"), 100);
+	addColumn(i18n("Widget's type", "Type"), 100);
 
 	installEventFilter(this);
 
--- trunk/koffice/kexi/formeditor/tabstopdialog.cpp #470557:470558
@@ -19,10 +19,12 @@
 */
 #include <qlayout.h>
 #include <qcheckbox.h>
+#include <qtooltip.h>
 
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <kpushbutton.h>
 
 #include "form.h"
 #include "objecttreeview.h"
@@ -54,26 +56,23 @@
 
 	QVBoxLayout *vbox = new QVBoxLayout();
 	l->addLayout(vbox, 0, 1);
-	QToolButton *up = new QToolButton(frame);
-	up->setIconSet(BarIconSet("1uparrow"));
-	up->setTextLabel(i18n("Move Widget Up"), true);
-	m_buttons.insert(BUp, up);
-	vbox->addWidget(up);
-	connect(up, SIGNAL(clicked()), this, SLOT(MoveItemUp()));
+	m_btnUp = new KPushButton(SmallIconSet("1uparrow"), i18n("Move Up"), frame);
+	QToolTip::add( m_btnUp, i18n("Move Widget Up") );
+	vbox->addWidget(m_btnUp);
+	connect(m_btnUp, SIGNAL(clicked()), this, SLOT(moveItemUp()));
 
-	QToolButton *down = new QToolButton(frame);
-	down->setIconSet(BarIconSet("1downarrow"));
-	down->setTextLabel(i18n("Move Widget Down"), true);
-	vbox->addWidget(down);
-	m_buttons.insert(BDown, down);
-	connect(down, SIGNAL(clicked()), this, SLOT(MoveItemDown()));
+	m_btnDown = new KPushButton(SmallIconSet("1downarrow"), i18n("Move Down"), frame);
+	QToolTip::add( m_btnDown, i18n("Move Widget Down") );
+	vbox->addWidget(m_btnDown);
+	connect(m_btnDown, SIGNAL(clicked()), this, SLOT(moveItemDown()));
 	vbox->addStretch();
 
 	m_check = new QCheckBox(i18n("Handle tab stops automatically"), frame, "tabstops_check");
 	connect(m_check, SIGNAL(toggled(bool)), this, SLOT(slotRadioClicked(bool)));
 	l->addMultiCellWidget(m_check, 1, 1, 0, 1);
 
-	setInitialSize(QSize(400, 250), true);
+	updateGeometry();
+	setInitialSize(QSize(500+m_btnUp->width(), QMAX(400,m_treeview->height())));
 }
 
 TabStopDialog::~TabStopDialog()
@@ -124,17 +123,21 @@
 }
 
 void
-TabStopDialog::MoveItemUp()
+TabStopDialog::moveItemUp()
 {
+	if (!m_treeview->selectedItem())
+		return;
 	QListViewItem *before = m_treeview->selectedItem()->itemAbove();
 	before->moveItem(m_treeview->selectedItem());
 	updateButtons(m_treeview->selectedItem());
 }
 
 void
-TabStopDialog::MoveItemDown()
+TabStopDialog::moveItemDown()
 {
 	QListViewItem *item = m_treeview->selectedItem();
+	if (!item)
+		return;
 	item->moveItem( item->nextSibling());
 	updateButtons(item);
 }
@@ -142,24 +145,16 @@
 void
 TabStopDialog::updateButtons(QListViewItem *item)
 {
-	if(!item)
-	{
-		m_buttons[BUp]->setEnabled(false);
-		m_buttons[BDown]->setEnabled(false);
-		return;
-	}
-
-	m_buttons[BUp]->setEnabled( (item->itemAbove() && m_treeview->isEnabled()
+	m_btnUp->setEnabled( item && (item->itemAbove() && m_treeview->isEnabled()
 	/*&& (item->itemAbove()->parent() == item->parent()))*/ ));
-	m_buttons[BDown]->setEnabled( item->nextSibling() && m_treeview->isEnabled() );
+	m_btnDown->setEnabled( item && item->nextSibling() && m_treeview->isEnabled() );
 }
 
 void
 TabStopDialog::slotRadioClicked(bool isOn)
 {
 	m_treeview->setEnabled(!isOn);
-	m_buttons[BUp]->setEnabled(!isOn);
-	m_buttons[BDown]->setEnabled(!isOn);
+	updateButtons( m_treeview->selectedItem() );
 }
 
 bool
--- trunk/koffice/kexi/formeditor/tabstopdialog.h #470557:470558
@@ -20,13 +20,12 @@
 #ifndef TABSTOPEDIT_DIALOG_H
 #define TABSTOPEDIT_DIALOG_H
 
-#include <qintdict.h>
-#include <qtoolbutton.h>
 #include <kdialogbase.h>
 
 class QListViewItem;
 class QCheckBox;
 class QToolButton;
+class KPushButton;
 
 namespace KFormDesigner {
 
@@ -46,17 +45,16 @@
 
 	public slots:
 		int exec(KFormDesigner::Form *form);
-		void MoveItemUp();
-		void MoveItemDown();
+		void moveItemUp();
+		void moveItemDown();
 		void updateButtons(QListViewItem*);
 		void slotRadioClicked(bool isOn);
 
 		bool autoTabStops() const;
 
 	protected:
-		enum {BUp = 10, BDown};
 		ObjectTreeView   *m_treeview;
-		QIntDict<QToolButton>  m_buttons;
+		KPushButton *m_btnUp, *m_btnDown;
 		QCheckBox *m_check;
 };
 
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel

[prev in list] [next in list] [prev in thread] [next in thread]