* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *\r
***************************************************************************/\r
\r
+#include <config-kmetadata.h>\r
#include "dolphinmainwindow.h"\r
\r
#include <assert.h>\r
#include "dolphinsettings.h"\r
#include "bookmarkssidebarpage.h"\r
#include "infosidebarpage.h"\r
-#include "generalsettings.h"\r
+#include "dolphin_generalsettings.h"\r
#include "viewpropertiesdialog.h"\r
#include "viewproperties.h"\r
+#include "metadataloader.h"\r
+#include "mainwindowadaptor.h"\r
\r
#include <kaction.h>\r
#include <kactioncollection.h>\r
#include <QSplitter>\r
#include <QDockWidget>\r
\r
-DolphinMainWindow::DolphinMainWindow() :\r
+DolphinMainWindow::DolphinMainWindow(int id) :\r
KMainWindow(0),\r
m_newMenu(0),\r
m_splitter(0),\r
- m_activeView(0)\r
+ m_activeView(0),\r
+ m_id(id)\r
{\r
setObjectName("Dolphin");\r
m_view[PrimaryIdx] = 0;\r
m_view[SecondaryIdx] = 0;\r
\r
+ new MainWindowAdaptor(this);\r
+ QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);\r
+\r
KonqUndoManager::incRef();\r
\r
KonqUndoManager* undoManager = KonqUndoManager::self();\r
QString seq = QKeySequence(Qt::ShiftModifier).toString();\r
seq.chop(1); // chop superfluous '+'\r
QAction* moveAction = popup.addAction(KIcon("goto"),\r
- i18n("&Move Here") + "\t" + seq);\r
+ i18n("&Move Here") + '\t' + seq);\r
\r
seq = QKeySequence(Qt::ControlModifier).toString();\r
seq.chop(1);\r
QAction* copyAction = popup.addAction(KIcon("editcopy"),\r
- i18n("&Copy Here") + "\t" + seq);\r
+ i18n("&Copy Here") + '\t' + seq);\r
\r
seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();\r
seq.chop(1);\r
QAction* linkAction = popup.addAction(KIcon("www"),\r
- i18n("&Link Here") + "\t" + seq);\r
+ i18n("&Link Here") + '\t' + seq);\r
\r
popup.addSeparator();\r
- QAction* cancelAction = popup.addAction(KIcon("stop"), i18n("Cancel"));\r
+ popup.addAction(KIcon("stop"), i18n("Cancel"));\r
\r
QAction* activatedAction = popup.exec(QCursor::pos());\r
if (activatedAction == moveAction) {\r
else if (activatedAction == linkAction) {\r
action = Qt::LinkAction;\r
}\r
- else if (activatedAction == cancelAction) {\r
+ else {\r
return;\r
}\r
}\r
emit activeViewChanged();\r
}\r
\r
+void DolphinMainWindow::changeUrl(const QString& url)\r
+{\r
+ if (activeView() != 0) {\r
+ activeView()->setUrl(KUrl(url));\r
+ }\r
+}\r
+\r
void DolphinMainWindow::slotViewModeChanged()\r
{\r
updateViewActions();\r
\r
void DolphinMainWindow::saveProperties(KConfig* config)\r
{\r
- config->setGroup("Primary view");\r
- config->writeEntry("Url", m_view[PrimaryIdx]->url().url());\r
- config->writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable());\r
+ KConfigGroup primaryView = config->group("Primary view");\r
+ primaryView.writeEntry("Url", m_view[PrimaryIdx]->url().url());\r
+ primaryView.writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable());\r
if (m_view[SecondaryIdx] != 0) {\r
- config->setGroup("Secondary view");\r
- config->writeEntry("Url", m_view[SecondaryIdx]->url().url());\r
- config->writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable());\r
+ KConfigGroup secondaryView = config->group("Secondary view");\r
+ secondaryView.writeEntry("Url", m_view[SecondaryIdx]->url().url());\r
+ secondaryView.writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable());\r
}\r
}\r
\r
void DolphinMainWindow::readProperties(KConfig* config)\r
{\r
- config->setGroup("Primary view");\r
- m_view[PrimaryIdx]->setUrl(config->readEntry("Url"));\r
- m_view[PrimaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));\r
+ const KConfigGroup primaryView = config->group("Primary view");\r
+ m_view[PrimaryIdx]->setUrl(primaryView.readEntry("Url"));\r
+ m_view[PrimaryIdx]->setUrlEditable(primaryView.readEntry("Editable Url", false));\r
if (config->hasGroup("Secondary view")) {\r
- config->setGroup("Secondary view");\r
+ const KConfigGroup secondaryView = config->group("Secondary view");\r
if (m_view[SecondaryIdx] == 0) {\r
toggleSplitView();\r
}\r
- m_view[SecondaryIdx]->setUrl(config->readEntry("Url"));\r
- m_view[SecondaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));\r
+ m_view[SecondaryIdx]->setUrl(secondaryView.readEntry("Url"));\r
+ m_view[SecondaryIdx]->setUrlEditable(secondaryView.readEntry("Editable Url", false));\r
}\r
else if (m_view[SecondaryIdx] != 0) {\r
toggleSplitView();\r
\r
const bool del = KMessageBox::warningContinueCancel(this,\r
text,\r
- QString::null,\r
+ QString(),\r
KGuiItem(i18n("Delete"), KIcon("editdelete"))\r
) == KMessageBox::Continue;\r
if (del) {\r
pasteAction->setText(i18n("Paste 1 File"));\r
}\r
else {\r
- pasteAction->setText(i18n("Paste %1 Files").arg(count));\r
+ pasteAction->setText(i18n("Paste %1 Files", count));\r
}\r
}\r
else {\r
setActiveView(m_view[PrimaryIdx]);\r
}\r
}\r
+ emit activeViewChanged();\r
}\r
\r
void DolphinMainWindow::reloadView()\r
\r
void DolphinMainWindow::editLocation()\r
{\r
- KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));\r
- action->setChecked(true);\r
m_activeView->setUrlEditable(true);\r
}\r
\r
// a proper default window size is given at the end of DolphinMainWindow::init().\r
GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();\r
const bool firstRun = generalSettings->firstRun();\r
+ if (firstRun) {\r
+ generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());\r
+ }\r
\r
setAcceptDrops(true);\r
\r
// assure a proper default size if Dolphin runs the first time\r
resize(640, 480);\r
}\r
+ #ifdef HAVE_KMETADATA\r
+ if (!DolphinApplication::app()->metadataLoader()->storageUp())\r
+ activeView()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);\r
+ #endif\r
}\r
\r
void DolphinMainWindow::loadSettings()\r
connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));\r
\r
QAction* properties = actionCollection()->addAction("properties");\r
- properties->setText(i18n("Propert&ies"));\r
- properties->setShortcut(Qt::Key_Alt | Qt::Key_Return);\r
+ properties->setText(i18n("Properties"));\r
+ properties->setShortcut(Qt::ALT | Qt::Key_Return);\r
connect(properties, SIGNAL(triggered()), this, SLOT(properties()));\r
\r
KStandardAction::quit(this, SLOT(quit()), actionCollection());\r
\r
KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");\r
showHiddenFiles->setText(i18n("Show Hidden Files"));\r
- //showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_ KDE4-TODO: what Qt-Key represents '.'?\r
+ showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);\r
connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));\r
\r
KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");\r
stop->setIcon(KIcon("stop"));\r
connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));\r
\r
+ // TODO: the URL navigator must emit a signal if the editable state has been\r
+ // changed, so that the corresponding showFullLocation action is updated. Also\r
+ // the naming "Show full Location" is currently confusing...\r
KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");\r
showFullLocation->setText(i18n("Show Full Location"));\r
showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);\r
connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));\r
\r
- KToggleAction* editLocation = actionCollection()->add<KToggleAction>("edit_location");\r
+ QAction* editLocation = actionCollection()->addAction("edit_location");\r
editLocation->setText(i18n("Edit Location"));\r
editLocation->setShortcut(Qt::Key_F6);\r
connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));\r
\r
KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));\r
splitAction->setChecked(m_view[SecondaryIdx] != 0);\r
+\r
+ KToggleAction* editableLocactionAction =\r
+ static_cast<KToggleAction*>(actionCollection()->action("editable_location"));\r
+ editableLocactionAction->setChecked(m_activeView->isUrlEditable());\r
}\r
\r
void DolphinMainWindow::updateGoActions()\r
projects / dolphin.git / blobdiff