From ed533e9c0b4b5ee6393f2ad78904ecfc9d6eb7fc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 01:27:23 -0500 Subject: [PATCH] Bring most mimetypes in line with XDG specifications. The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown --- src/app/mainwindow.cpp | 6 +++--- src/app/testvtabwidget.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 3ae271a..7972b92 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -904,14 +904,14 @@ void MainWindow::createWidgets() { vtabWidget->addTab(mBookmarkViewController->widget(), SmallIcon("bookmark"), i18n("Bookmarks")); // File widget - mFileDock = mDockArea->createDockWidget("Files",SmallIcon("image"),NULL,i18n("Files")); + mFileDock = mDockArea->createDockWidget("Files",SmallIcon("image-x-generic"),NULL,i18n("Files")); mFileViewController=new FileViewController(this, actionCollection()); mFileDock->setWidget(mFileViewController); mFileDock->setEnableDocking(KDockWidget::DockNone); mDockArea->setMainDockWidget(mFileDock); // Meta info edit widget - mMetaDock = mDockArea->createDockWidget("File Attributes", SmallIcon("info"),NULL, + mMetaDock = mDockArea->createDockWidget("File Attributes", SmallIcon("application-vnd.tde.info"),NULL, i18n("Image Comment")); mMetaEdit = new MetaEdit(mMetaDock, mDocument); mMetaDock->setWidget(mMetaEdit); @@ -967,7 +967,7 @@ void MainWindow::createActions() { mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode"); mSwitchToBrowseMode->setExclusiveGroup("centralStackMode"); mSwitchToBrowseMode->setChecked(true); - mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode"); + mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode"); mSwitchToViewMode->setExclusiveGroup("centralStackMode"); // File diff --git a/src/app/testvtabwidget.cpp b/src/app/testvtabwidget.cpp index e8fb8e9..05655c7 100644 --- a/src/app/testvtabwidget.cpp +++ b/src/app/testvtabwidget.cpp @@ -40,7 +40,7 @@ int main(int argc, char* argv[]) { TQLabel* lbl=new TQLabel("label 1", &tabWidget); tabWidget.addTab(lbl, SmallIcon("text"), "tab1"); lbl=new TQLabel("label 2", &tabWidget); - tabWidget.addTab(lbl, SmallIcon("image"), "tab2"); + tabWidget.addTab(lbl, SmallIcon("image-x-generic"), "tab2"); app.setMainWidget(&tabWidget); tabWidget.show();