From: <su...@us...> - 2007-12-11 13:16:14
|
Revision: 2323 http://tora.svn.sourceforge.net/tora/?rev=2323&view=rev Author: subik Date: 2007-12-11 05:16:01 -0800 (Tue, 11 Dec 2007) Log Message: ----------- SGA to QActions; removed un-needed toConnection widgets in h files Modified Paths: -------------- branches/tora-1.4/tora/src/torollback.cpp branches/tora-1.4/tora/src/torollback.h branches/tora-1.4/tora/src/tosecurity.cpp branches/tora-1.4/tora/src/tosecurity.h branches/tora-1.4/tora/src/tosgatrace.cpp branches/tora-1.4/tora/src/tosgatrace.h branches/tora-1.4/tora/src/tostorage.cpp branches/tora-1.4/tora/src/tostorage.h Modified: branches/tora-1.4/tora/src/torollback.cpp =================================================================== --- branches/tora-1.4/tora/src/torollback.cpp 2007-12-11 13:00:21 UTC (rev 2322) +++ branches/tora-1.4/tora/src/torollback.cpp 2007-12-11 13:16:01 UTC (rev 2323) @@ -726,8 +726,8 @@ toolbar->addWidget(Refresh); // toolbar->setStretchableWidget(new QLabel(toolbar, TO_TOOLBAR_WIDGET_NAME)); - ChangeConnection = new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); - toolbar->addWidget(ChangeConnection); + toChangeConnection * chConn = new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); + toolbar->addWidget(chConn); QSplitter *splitter = new QSplitter(Qt::Vertical, this); Segments = new toRollbackView(splitter); Modified: branches/tora-1.4/tora/src/torollback.h =================================================================== --- branches/tora-1.4/tora/src/torollback.h 2007-12-11 13:00:21 UTC (rev 2322) +++ branches/tora-1.4/tora/src/torollback.h 2007-12-11 13:16:01 UTC (rev 2323) @@ -57,7 +57,6 @@ class toSGAStatement; class toStorageDefinition; class toResultLong; -class toChangeConnection; class toRollbackDialog : public QDialog, public Ui::toRollbackDialogUI @@ -95,8 +94,6 @@ QAction * NewAct; QAction * DropAct; - toChangeConnection * ChangeConnection; - Q3PopupMenu *ToolMenu; QComboBox *Refresh; Modified: branches/tora-1.4/tora/src/tosecurity.cpp =================================================================== --- branches/tora-1.4/tora/src/tosecurity.cpp 2007-12-11 13:00:21 UTC (rev 2322) +++ branches/tora-1.4/tora/src/tosecurity.cpp 2007-12-11 13:16:01 UTC (rev 2323) @@ -1548,8 +1548,8 @@ connect(DisplaySQLAct, SIGNAL(triggered()), this, SLOT(displaySQL(void))); toolbar->addAction(DisplaySQLAct); - ChangeConnection = new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); - toolbar->addWidget(ChangeConnection); + toChangeConnection * chConn = new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); + toolbar->addWidget(chConn); QSplitter *splitter = new QSplitter(Qt::Horizontal, this); UserList = new toListView(splitter); Modified: branches/tora-1.4/tora/src/tosecurity.h =================================================================== --- branches/tora-1.4/tora/src/tosecurity.h 2007-12-11 13:00:21 UTC (rev 2322) +++ branches/tora-1.4/tora/src/tosecurity.h 2007-12-11 13:16:01 UTC (rev 2323) @@ -55,7 +55,6 @@ // class toListView; class toSecurityPage; class toSecurityQuota; -class toChangeConnection; class toSecuritySystem : public toListView @@ -137,8 +136,6 @@ QAction * AddRoleAct; QAction * DisplaySQLAct; - toChangeConnection * ChangeConnection; - QTabWidget *Tabs; std::list<QString> sql(void); public: Modified: branches/tora-1.4/tora/src/tosgatrace.cpp =================================================================== --- branches/tora-1.4/tora/src/tosgatrace.cpp 2007-12-11 13:00:21 UTC (rev 2322) +++ branches/tora-1.4/tora/src/tosgatrace.cpp 2007-12-11 13:16:01 UTC (rev 2323) @@ -133,33 +133,48 @@ { QToolBar *toolbar = toAllocBar(this, tr("SGA trace")); - new QToolButton(QPixmap(const_cast<const char**>(refresh_xpm)), - tr("Fetch statements in SGA"), - tr("Fetch statements in SGA"), - this, SLOT(refresh(void)), - toolbar); + FetchAct = new QAction(QPixmap(const_cast<const char**>(refresh_xpm)), + tr("Fetch statements in SGA"), this); + connect(FetchAct, SIGNAL(triggered()), this, SLOT(refresh(void))); + toolbar->addAction(FetchAct); + toolbar->addSeparator(); - new QLabel(tr("Schema") + " ", toolbar, TO_TOOLBAR_WIDGET_NAME); + + QLabel * labSchema = new QLabel(tr("Schema") + " ", toolbar, TO_TOOLBAR_WIDGET_NAME); + toolbar->addWidget(labSchema); + Schema = new toResultCombo(toolbar); Schema->additionalItem(tr("Any")); Schema->setSelected(connection.user().upper()); Schema->query(toSQL::sql(toSQL::TOSQL_USERLIST)); + Schema->setSizeAdjustPolicy(QComboBox::AdjustToContents); + toolbar->addWidget(Schema); connect(Schema, SIGNAL(activated(const QString &)), this, SLOT(changeSchema(const QString &))); toolbar->addSeparator(); - new QLabel(tr("Refresh") + " ", toolbar, TO_TOOLBAR_WIDGET_NAME); + + QLabel * labRef = new QLabel(tr("Refresh") + " ", toolbar, TO_TOOLBAR_WIDGET_NAME); + toolbar->addWidget(labRef); connect(Refresh = toRefreshCreate(toolbar, TO_TOOLBAR_WIDGET_NAME), SIGNAL(activated(const QString &)), this, SLOT(changeRefresh(const QString &))); + toolbar->addWidget(Refresh); toolbar->addSeparator(); - new QLabel(tr("Type") + " ", toolbar, TO_TOOLBAR_WIDGET_NAME); + + QLabel * labType = new QLabel(tr("Type") + " ", toolbar, TO_TOOLBAR_WIDGET_NAME); + toolbar->addWidget(labType); + Type = new QComboBox(toolbar, TO_TOOLBAR_WIDGET_NAME); Type->insertItem(tr("SGA")); Type->insertItem(tr("Long operations")); + toolbar->addWidget(Type); toolbar->addSeparator(); - new QLabel(tr("Selection") + " ", toolbar, TO_TOOLBAR_WIDGET_NAME); + + QLabel * labSelect = new QLabel(tr("Selection") + " ", toolbar, TO_TOOLBAR_WIDGET_NAME); + toolbar->addWidget(labSelect); + Limit = new QComboBox(toolbar, TO_TOOLBAR_WIDGET_NAME); Limit->insertItem(tr("All")); Limit->insertItem(tr("Unfinished")); @@ -174,9 +189,11 @@ Limit->insertItem(tr("Top buffergets/exec")); Limit->insertItem(tr("Top rows/exec")); Limit->insertItem(tr("Top buffers/row")); + toolbar->addWidget(Limit); // toolbar->setStretchableWidget(new QLabel(toolbar, TO_TOOLBAR_WIDGET_NAME)); - new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); + toChangeConnection * chConn = new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); + toolbar->addWidget(chConn); QSplitter *splitter = new QSplitter(Qt::Vertical, this); Modified: branches/tora-1.4/tora/src/tosgatrace.h =================================================================== --- branches/tora-1.4/tora/src/tosgatrace.h 2007-12-11 13:00:21 UTC (rev 2322) +++ branches/tora-1.4/tora/src/tosgatrace.h 2007-12-11 13:16:01 UTC (rev 2323) @@ -64,6 +64,8 @@ toResultLong *Trace; QTabWidget *ResultTab; + + QAction * FetchAct; toResultCombo *Schema; QComboBox *Type; QComboBox *Refresh; Modified: branches/tora-1.4/tora/src/tostorage.cpp =================================================================== --- branches/tora-1.4/tora/src/tostorage.cpp 2007-12-11 13:00:21 UTC (rev 2322) +++ branches/tora-1.4/tora/src/tostorage.cpp 2007-12-11 13:16:01 UTC (rev 2323) @@ -933,8 +933,8 @@ connect(MoveFileAct, SIGNAL(triggered()), this, SLOT(moveFile(void))); toolbar->addAction(MoveFileAct); - ChangeConnection = new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); - toolbar->addWidget(ChangeConnection); + toChangeConnection * chConn = new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); + toolbar->addWidget(chConn); QSplitter *splitter = new QSplitter(Qt::Vertical, this); Storage = new toResultStorage(!StorageTool.config(CONF_DISP_AVAILABLEGRAPH, "Yes").isEmpty(), Modified: branches/tora-1.4/tora/src/tostorage.h =================================================================== --- branches/tora-1.4/tora/src/tostorage.h 2007-12-11 13:00:21 UTC (rev 2322) +++ branches/tora-1.4/tora/src/tostorage.h 2007-12-11 13:16:01 UTC (rev 2323) @@ -69,7 +69,6 @@ class toResultView; class toStorageDefinition; class toStorageDialog; -class toChangeConnection; class toStorageTablespace : public QWidget, public Ui::toStorageTablespaceUI @@ -203,7 +202,6 @@ QAction *DropTablespaceAct; QAction * CreateTablespaceAct; - toChangeConnection * ChangeConnection; public: toStorage(QWidget *parent, toConnection &connection); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |