From 389d88e37a7aae1e414a51a903dd4520cdb976b2 Mon Sep 17 00:00:00 2001 From: Peter Mash Morgan Date: Tue, 5 Oct 2010 15:23:43 +0100 Subject: [PATCH] db toolbar --- README.txt | 1 + sqlitebrowser/sqlitebrowser/editfieldform.cpp | 3 +- sqlitebrowser/sqlitebrowser/editfieldform.h | 87 +++---------------- sqlitebrowser/sqlitebrowser/form1.h | 15 +++- 4 files changed, 27 insertions(+), 79 deletions(-) diff --git a/README.txt b/README.txt index ae4d4491..75c7bb4b 100644 --- a/README.txt +++ b/README.txt @@ -16,6 +16,7 @@ Hacking I'm progressing throught removing Qt3 Adding icons and contect menu +The icons are placeholders atmp Generally clearing up Problesm? diff --git a/sqlitebrowser/sqlitebrowser/editfieldform.cpp b/sqlitebrowser/sqlitebrowser/editfieldform.cpp index 05fc6588..296f32e9 100644 --- a/sqlitebrowser/sqlitebrowser/editfieldform.cpp +++ b/sqlitebrowser/sqlitebrowser/editfieldform.cpp @@ -45,7 +45,8 @@ void editFieldForm::setDB(DBBrowserDB &db) void editFieldForm::setInitialValues(bool is_new, QString table, QString fld_name, QString fld_type) { - + this->is_new = is_new; + saveButton->setText(is_new ? "Create Field" : "Change Field"); original_field_name = QString(fld_name); table_name = table; diff --git a/sqlitebrowser/sqlitebrowser/editfieldform.h b/sqlitebrowser/sqlitebrowser/editfieldform.h index 3d3fa422..d8c4b8a8 100644 --- a/sqlitebrowser/sqlitebrowser/editfieldform.h +++ b/sqlitebrowser/sqlitebrowser/editfieldform.h @@ -41,22 +41,20 @@ public: DBBrowserDB pdb; + QGridLayout *gridLayout; QVBoxLayout *vboxLayout; QLabel *lblFieldName; - QLabel *lblFieldType; - QSpacerItem *spacer17; - QHBoxLayout *hboxLayout; - QSpacerItem *spacer15; - QPushButton *cancelButton; - QPushButton *saveButton; - QGridLayout *gridLayout1; - QHBoxLayout *hboxLayout1; - QComboBox *typeBox; - QToolButton *typeButton; QLineEdit *nameLineEdit; + QLabel *lblFieldType; QButtonGroup *groupRadioTypes; + QPushButton *cancelButton; + QPushButton *saveButton; + + + +; void setupUi(QDialog *editFieldForm) { @@ -131,26 +129,10 @@ public: radioLayout->addWidget(txtCustomType); txtCustomType->setDisabled(true); - gridLayout = new QGridLayout(); - mainVBoxLayout->addLayout(gridLayout ); - - - gridLayout->setSpacing(6); - gridLayout->setContentsMargins(11, 11, 11, 11); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - vboxLayout = new QVBoxLayout(); - vboxLayout->setSpacing(6); - vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); - gridLayout->addLayout(vboxLayout, 0, 0, 1, 1); - - spacer17 = new QSpacerItem(20, 14, QSizePolicy::Minimum, QSizePolicy::Expanding); - - gridLayout->addItem(spacer17, 1, 1, 1, 1); - //*** Bottom Button Layout QHBoxLayout *bottomButtonBox = new QHBoxLayout(); mainVBoxLayout->addLayout(bottomButtonBox); @@ -171,53 +153,19 @@ public: bottomButtonBox->addWidget(saveButton); - // gridLayout->addLayout(hboxLayout, 2, 0, 1, 2); - - gridLayout1 = new QGridLayout(); - gridLayout1->setSpacing(6); - gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); - hboxLayout1 = new QHBoxLayout(); - hboxLayout1->setSpacing(6); - hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); - typeBox = new QComboBox(editFieldForm); - typeBox->setObjectName(QString::fromUtf8("typeBox")); - - hboxLayout1->addWidget(typeBox); - - typeButton = new QToolButton(editFieldForm); - typeButton->setObjectName(QString::fromUtf8("typeButton")); - QSizePolicy sizePolicy(static_cast(0), static_cast(0)); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(typeButton->sizePolicy().hasHeightForWidth()); - typeButton->setSizePolicy(sizePolicy); - - hboxLayout1->addWidget(typeButton); - - - gridLayout1->addLayout(hboxLayout1, 1, 0, 1, 1); - - //nameLineEdit = new QLineEdit(editFieldForm); - //nameLineEdit->setObjectName(QString::fromUtf8("nameLineEdit")); - //mainVBoxLayout->addWidget(nameLineEdit); - //#gridLayout1->addWidget(nameLineEdit, 0, 0, 1, 1); - - - gridLayout->addLayout(gridLayout1, 0, 1, 1, 1); - nameLineEdit->setFocus(); retranslateUi(editFieldForm); QObject::connect(cancelButton, SIGNAL(clicked()), editFieldForm, SLOT(reject())); QObject::connect(saveButton, SIGNAL(clicked()), editFieldForm, SLOT(confirmEdit())); QObject::connect(nameLineEdit, SIGNAL(textChanged(QString)), editFieldForm, SLOT(enableSave())); - QObject::connect(typeButton, SIGNAL(clicked()), editFieldForm, SLOT(getCustomType())); QObject::connect(groupRadioTypes, SIGNAL(buttonClicked(QAbstractButton*)), editFieldForm, SLOT(on_radio_button_clicked(QAbstractButton*))); QMetaObject::connectSlotsByName(editFieldForm); } // setupUi + void retranslateUi(QDialog *editFieldForm) { editFieldForm->setWindowTitle(QApplication::translate("editFieldForm", "Edit field name and type", 0, QApplication::UnicodeUTF8)); @@ -225,21 +173,7 @@ public: lblFieldType->setText(QApplication::translate("editFieldForm", "Field type:", 0, QApplication::UnicodeUTF8)); cancelButton->setText(QApplication::translate("editFieldForm", "Cancel", 0, QApplication::UnicodeUTF8)); saveButton->setText(QApplication::translate("editFieldForm", "Apply Changes", 0, QApplication::UnicodeUTF8)); - typeBox->clear(); - typeBox->insertItems(0, QStringList() - << QString() - << QApplication::translate("editFieldForm", "TEXT", 0, QApplication::UnicodeUTF8) - << QApplication::translate("editFieldForm", "NUMERIC", 0, QApplication::UnicodeUTF8) - << QApplication::translate("editFieldForm", "BLOB", 0, QApplication::UnicodeUTF8) - << QApplication::translate("editFieldForm", "INTEGER PRIMARY KEY", 0, QApplication::UnicodeUTF8) - ); - typeButton->setText(QApplication::translate("editFieldForm", "...", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - typeButton->setProperty("toolTip", QVariant(QApplication::translate("editFieldForm", "Custom type", 0, QApplication::UnicodeUTF8))); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_WHATSTHIS - typeButton->setProperty("whatsThis", QVariant(QApplication::translate("editFieldForm", "Click this button to enter a new type for the field", 0, QApplication::UnicodeUTF8))); -#endif // QT_NO_WHATSTHIS + } // retranslateUi }; @@ -264,6 +198,7 @@ public: QString field_name; QString field_type; QString original_field_name; + bool is_new; public slots: virtual void setInitialValues( bool is_new, QString table, QString fld_name, QString fld_type ); diff --git a/sqlitebrowser/sqlitebrowser/form1.h b/sqlitebrowser/sqlitebrowser/form1.h index b870660c..2300f450 100644 --- a/sqlitebrowser/sqlitebrowser/form1.h +++ b/sqlitebrowser/sqlitebrowser/form1.h @@ -223,6 +223,8 @@ public: sqlLogAction->setCheckable(true); const QIcon icon4 = QIcon(qPixmapFromMimeSource("log.png")); sqlLogAction->setIcon(icon4); + + fileImportCSVAction = new QAction(mainForm); fileImportCSVAction->setObjectName(QString::fromUtf8("fileImportCSVAction")); fileImportCSVAction->setName("fileImportCSVAction"); @@ -270,8 +272,8 @@ public: editModifyTableActionPopup->setIcon(QIcon(":/icons/table_modify")); + //************************************************ //** Add, Modify, Delete Field - editAddFieldActionPopup = new QAction(mainForm); editAddFieldActionPopup->setText("Add Field"); editAddFieldActionPopup->setDisabled(true); @@ -287,7 +289,8 @@ public: editDeleteFieldActionPopup->setDisabled(true); editDeleteFieldActionPopup->setIcon(QIcon(":/icons/field_delete")); - //** Create Index + //************************************************ + //** Create/Delete Index editCreateIndexAction = new QAction(mainForm); editCreateIndexAction->setObjectName(QString::fromUtf8("editCreateIndexAction")); editCreateIndexAction->setName("editCreateIndexAction"); @@ -553,22 +556,30 @@ public: Toolbar->addAction(fileNewAction); Toolbar->addAction(fileOpenAction); + Toolbar->addSeparator(); + Toolbar->addAction(fileSaveAction); Toolbar->addAction(fileRevertAction); Toolbar->addSeparator(); + Toolbar->addAction(editCreateTableAction); Toolbar->addAction(editDeleteTableAction); Toolbar->addAction(editModifyTableAction); + Toolbar->addSeparator(); + Toolbar->addAction(editCreateIndexAction); Toolbar->addAction(editDeleteIndexAction); Toolbar->addSeparator(); + Toolbar->addAction(sqlLogAction); Toolbar->addSeparator(); Toolbar->addAction(helpWhatsThisAction); + menubar->addAction(fileMenu->menuAction()); menubar->addAction(EditMenu->menuAction()); menubar->addAction(ViewMenu->menuAction()); menubar->addAction(PopupMenu->menuAction()); + fileMenu->addAction(fileNewAction); fileMenu->addAction(fileOpenAction); fileMenu->addAction(fileCloseAction);