[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kexi
From: Jarosław Staniek <staniek () kde ! org>
Date: 2010-01-17 1:01:16
Message-ID: 1263690076.747879.16620.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1075921 by staniek:
Main Window - let the tabbed toolbar provide similar functionality as the GUI of Kexi \
1.x
*hide not working items in the Project tab
*added "cut" action to the "data" tab
*improve name for "copy special" and "paste special" actions
*moved "copy special" action to project navigator's context menu
*moved "import tables" action from "tools" to "external data" tab
M +9 -0 doc/dev/CHANGELOG-Kexi-js
M +11 -5 main/KexiMainWindow.cpp
M +11 -10 main/KexiMainWindow_p.h
M +23 -7 widget/KexiProjectListView.cpp
M +6 -3 widget/KexiProjectListView.h
--- trunk/koffice/kexi/doc/dev/CHANGELOG-Kexi-js #1075920:1075921
@@ -60,6 +60,15 @@
~~~~~~~~~~~~~~~~ 2.2 alpha 1 ~~~~~~~~~~~~~~~~
+2010-01-16
+Main Window
+*hide not working items in the Project tab
+*added "cut" action to the "data" tab
+*improve name for "copy special" and "paste special" actions
+*moved "copy special" action to project navigator's context menu
+*moved "import tables" action from "tools" to "external data" tab
+TODO: add show project nav/ show prop editor to the kexi menu
+
2010-01-15
KoProperty
*ported the line style editor
--- trunk/koffice/kexi/main/KexiMainWindow.cpp #1075920:1075921
@@ -750,7 +750,8 @@
ac->addAction("project_import_data_table",
d->action_project_import_data_table = new KAction(
KIcon("table"), /*! @todo: change to "file_import" with a table or so */
- i18nc("Import->Table Data From File...", "Table Data From &File..."), \
this)); + i18nc("Import->Table Data From File...", "Import Data From \
&File..."), this)); +//orig i18nc("Import->Table Data From File...", \
"Table Data From &File..."), this));
d->action_project_import_data_table->setToolTip(i18n("Import table data from \
a file"));
d->action_project_import_data_table->setWhatsThis(i18n("Imports table data \
from a file.")); connect(d->action_project_import_data_table, SIGNAL(triggered()),
@@ -760,7 +761,8 @@
ac->addAction("project_export_data_table",
d->action_project_export_data_table = new KAction(
KIcon("table"), /*! @todo: change to "file_export" with a table or so */
- i18nc("Export->Table or Query Data to File...", "Table or Query Data to \
&File..."), this)); + i18nc("Export->Table or Query Data to File...", "Export \
Data to &File..."), this)); +//orig: i18nc("Export->Table or Query Data to \
File...", "Table or Query Data to &File..."), this)); \
d->action_project_export_data_table->setToolTip(
i18n("Export data from the active table or query data to a file"));
d->action_project_export_data_table->setWhatsThis(
@@ -808,7 +810,8 @@
ac->addAction("edit_paste_special_data_table",
d->action_edit_paste_special_data_table = new KAction(
KIcon("table"),
- i18nc("Paste Special->As Data &Table...", "As Data &Table..."), this));
+ i18nc("Paste Special->As Data &Table...", "Paste Special..."), this));
+//orig i18nc("Paste Special->As Data &Table...", "As Data &Table..."), \
this)); d->action_edit_paste_special_data_table->setToolTip(
i18n("Paste clipboard data as a table"));
d->action_edit_paste_special_data_table->setWhatsThis(
@@ -820,7 +823,8 @@
ac->addAction("edit_copy_special_data_table",
d->action_edit_copy_special_data_table = new KAction(
KIcon("table"),
- i18nc("Copy Special->Table or Query Data...", "Table or Query as Data \
Table..."), + i18nc("Copy Special->Table or Query Data...", "Copy \
Special..."), +//orig i18nc("Copy Special->Table or Query Data...", "Table or \
Query as Data Table..."), this));
d->action_edit_copy_special_data_table->setToolTip(
i18n("Copy selected table or query data to clipboard"));
@@ -2037,7 +2041,9 @@
this, SLOT(renameObject(KexiPart::Item*, const QString&, bool&)));
connect(d->nav, SIGNAL(executeItem(KexiPart::Item*)),
this, SLOT(executeItem(KexiPart::Item*)));
- connect(d->nav, SIGNAL(exportItemAsDataTable(KexiPart::Item*)),
+ connect(d->nav, SIGNAL(exportItemToClipboardAsDataTable(KexiPart::Item*)),
+ this, SLOT(copyItemToClipboardAsDataTable(KexiPart::Item*)));
+ connect(d->nav, SIGNAL(exportItemToFileAsDataTable(KexiPart::Item*)),
this, SLOT(exportItemAsDataTable(KexiPart::Item*)));
connect(d->nav, SIGNAL(printItem(KexiPart::Item*)),
this, SLOT(printItem(KexiPart::Item*)));
--- trunk/koffice/kexi/main/KexiMainWindow_p.h #1075920:1075921
@@ -179,12 +179,12 @@
setCurrentWidget(tbar); // the default
addAction(tbar, "project_new");
addAction(tbar, "project_open");
- addAction(tbar, "project_print");
- addAction(tbar, "project_print_preview");
- addAction(tbar, "project_print_setup");
+//! @todo re-add addAction(tbar, "project_print");
+//! @todo re-add addAction(tbar, "project_print_preview");
+//! @todo re-add addAction(tbar, "project_print_setup");
//no "project_save" here...
- addSeparatorAndAction(tbar, "project_saveas");
- addSeparatorAndAction(tbar, "project_properties");
+//! @todo re-add addSeparatorAndAction(tbar, "project_saveas");
+//! @todo re-add addSeparatorAndAction(tbar, "project_properties");
addSeparatorAndAction(tbar, "project_close");
if (!userMode) {
@@ -192,8 +192,9 @@
}
tbar = d->createToolBar("data", i18n("Data"));
+ addAction(tbar, "edit_cut");
addAction(tbar, "edit_copy");
- addAction(tbar, "edit_copy_special_data_table");
+//moved to project navigator addAction(tbar, "edit_copy_special_data_table");
addAction(tbar, "edit_paste");
if (!userMode)
addAction(tbar, "edit_paste_special_data_table");
@@ -217,9 +218,10 @@
QToolBar *sub_tbar = new KToolBar(gbox);
gbox_lyr->addWidget(sub_tbar);
*/
- if (!userMode)
+ if (!userMode) {
addAction(tbar, "project_import_data_table");
-
+ addAction(tbar, "tools_import_tables");
+ }
/* gbox = new QGroupBox( i18n("Export"), tbar );
gbox->setFlat(true);
gbox->setFont(Kexi::smallFont(this));
@@ -230,11 +232,10 @@
sub_tbar = new KToolBar(gbox);
gbox_lyr->addWidget(sub_tbar);
*/
- addAction(tbar, "project_export_data_table");
+ addSeparatorAndAction(tbar, "project_export_data_table");
tbar = d->createToolBar("tools", i18n("Tools"));
addAction(tbar, "tools_import_project");
- addAction(tbar, "tools_import_tables");
addAction(tbar, "tools_compact_database");
//! @todo move to form plugin
--- trunk/koffice/kexi/widget/KexiProjectListView.cpp #1075920:1075921
@@ -199,12 +199,19 @@
m_actions->addAction("export_object",
m_exportActionMenu = new KActionMenu(i18n("Export"), \
this));
- m_dataExportAction = addAction("exportAsDataTable", KIcon("table"),
+ m_dataExportToClipboardAction = addAction("exportToClipboardAsDataTable", \
KIcon("edit-copy"), + i18nc("Export->To Clipboard \
as Data... ", "To &Clipboard..."), + i18n("Export \
data to clipboard"), + i18n("Exports data from the \
currently selected table or query to clipboard."), + \
SLOT(slotExportToClipboardAsDataTable())); + \
m_exportActionMenu->addAction(m_dataExportToClipboardAction); +
+ m_dataExportToFileAction = addAction("exportToFileAsDataTable", KIcon("table"),
i18nc("Export->To File As Data &Table... ", "To \
&File As Data Table..."), i18n("Export data to a file"),
- i18n("Exports data from the currently selected \
table or query data to a file."),
- SLOT(slotExportAsDataTable()));
- m_exportActionMenu->addAction(m_dataExportAction);
+ i18n("Exports data from the currently selected \
table or query to a file."), + \
SLOT(slotExportToFileAsDataTable())); + \
m_exportActionMenu->addAction(m_dataExportToFileAction);
m_printAction = addAction("print_object", KIcon("document-print"), \
i18n("&Print..."), i18n("Print data"),
@@ -731,15 +738,24 @@
emit executeItem(item);
}
-void KexiProjectListView::slotExportAsDataTable()
+void KexiProjectListView::slotExportToClipboardAsDataTable()
{
- if (!m_dataExportAction)
+ if (!m_dataExportToClipboardAction)
return;
KexiPart::Item* item = selectedPartItem();
if (item)
- emit exportItemAsDataTable(item);
+ emit exportItemToClipboardAsDataTable(item);
}
+void KexiProjectListView::slotExportToFileAsDataTable()
+{
+ if (!m_dataExportToFileAction)
+ return;
+ KexiPart::Item* item = selectedPartItem();
+ if (item)
+ emit exportItemToFileAsDataTable(item);
+}
+
KexiPart::Item* KexiProjectListView::selectedPartItem() const
{
KexiProjectListViewItem *it = \
static_cast<KexiProjectListViewItem*>(m_list->selectedItem());
--- trunk/koffice/kexi/widget/KexiProjectListView.h #1075920:1075921
@@ -124,8 +124,10 @@
void executeItem(KexiPart::Item*);
- void exportItemAsDataTable(KexiPart::Item*);
+ void exportItemToClipboardAsDataTable(KexiPart::Item*);
+ void exportItemToFileAsDataTable(KexiPart::Item*);
+
void printItem(KexiPart::Item*);
void pageSetupForItem(KexiPart::Item*);
@@ -147,7 +149,8 @@
void slotPaste();
void slotRename();
void slotExecuteObject();
- void slotExportAsDataTable();
+ void slotExportToClipboardAsDataTable();
+ void slotExportToFileAsDataTable();
void slotPrintObject();
void slotPageSetupForObject();
@@ -170,7 +173,7 @@
// *m_newObjectToolbarAction,
*m_openAction, *m_designAction, *m_editTextAction,
*m_executeAction,
- *m_dataExportAction, *m_printAction, *m_pageSetupAction;
+ *m_dataExportToClipboardAction, *m_dataExportToFileAction, *m_printAction, \
*m_pageSetupAction; KActionMenu* m_exportActionMenu;
// KMenu* m_newObjectMenu;
QAction *m_itemMenuTitle, *m_partMenuTitle,
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic