| 4d065be8 | 2014-10-22 01:27:25 | Timothy Pearson |
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 |
||
|
M chalk/ui/layerlist.cpp M karbon/dialogs/vconfiguredlg.cc M kexi/data/trinity4compat/x-sqlite2.desktop M kexi/data/trinity4compat/x-sqlite3.desktop M kexi/formeditor/factories/stdwidgetfactory.cpp M kexi/kexiutils/debuggui.cpp M kexi/main/printing/kexisimpleprintingpagesetup.cpp M kexi/main/startup/KexiProjectSelector.cpp M kexi/main/startup/KexiStartupDialog.cpp M kexi/plugins/forms/kexiformpart.cpp M kexi/plugins/reports/kexireportfactory.cpp M kexi/plugins/tables/kexitabledesignerview.cpp M kivio/kiviopart/ui/kiviooptionsdialog.cpp M kplato/kptconfigdialog.cc M kpresenter/KPrConfig.cpp M kword/KWConfig.cpp M mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop M mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop M mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop M mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop M mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop M mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop M mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop M mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop M mimetypes/trinity3/vnd.oasis.opendocument.text.desktop M mimetypes/trinity51/x-raw.desktop M templates/Illustration.desktop M templates/Presentation.desktop M templates/SpreadSheet.desktop M templates/TextDocument.desktop |
||
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 7f7b118..c7e9730 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -733,7 +733,7 @@
for( int i = 0, n = d->properties.count(); i < n; ++i )
if( !layer->isFolder() || d->properties[i].validForFolders )
d->contextMenu.insertItem( layer->d->properties[i] ? d->properties[i].enabledIcon : d->properties[i].disabledIcon, d->properties[i].displayName, MenuItems::COUNT + i );
- d->contextMenu.insertItem( SmallIconSet( "info" ), i18n( "&Properties" ), MenuItems::LayerProperties );
+ d->contextMenu.insertItem( SmallIconSet( "application-vnd.tde.info" ), i18n( "&Properties" ), MenuItems::LayerProperties );
d->contextMenu.insertSeparator();
d->contextMenu.insertItem( SmallIconSet( "edit-delete" ),
selectedLayers().count() > 1 ? i18n( "Remove Layers" )
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index bc4e5eb..49f874f 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -71,7 +71,7 @@
page = addVBoxPage(
i18n( "Document" ), i18n( "Document Settings" ),
- BarIcon( "document", TDEIcon::SizeMedium ) );
+ BarIcon( "text-x-generic", TDEIcon::SizeMedium ) );
m_defaultDocPage = new VConfigDefaultPage( parent, page );
connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );
diff --git a/kexi/data/trinity4compat/x-sqlite2.desktop b/kexi/data/trinity4compat/x-sqlite2.desktop
index 63f0f1d..8bdf1f8 100644
--- a/kexi/data/trinity4compat/x-sqlite2.desktop
+++ b/kexi/data/trinity4compat/x-sqlite2.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-sqlite2
-Icon=empty
+Icon=application-x-zerosize
Patterns=
Comment=SQLite2 Database File
Comment[bg]=�������� ���� SQLite2
diff --git a/kexi/data/trinity4compat/x-sqlite3.desktop b/kexi/data/trinity4compat/x-sqlite3.desktop
index ee2756d..3704e18 100644
--- a/kexi/data/trinity4compat/x-sqlite3.desktop
+++ b/kexi/data/trinity4compat/x-sqlite3.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-sqlite3
-Icon=empty
+Icon=application-x-zerosize
Patterns=
Comment=SQLite3 Database File
Comment[bg]=�������� ���� SQLite3
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index c5a4a5c..adb4d1b 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -388,7 +388,7 @@
if(c == TQLABEL_OBJECT_NAME_STRING)
w = new TQLabel(text, p, n);
else if(c == "KexiPictureLabel")
- w = new KexiPictureLabel(DesktopIcon("image"), p, n);
+ w = new KexiPictureLabel(DesktopIcon("image-x-generic"), p, n);
else if(c == "KLineEdit")
{
diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index ec9edfb..dd36052 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -46,7 +46,7 @@
debugWindowTab = new KTabWidget(debugWindow, "debugWindowTab");
lyr->addWidget( debugWindowTab );
debugWindow->resize(900, 600);
- debugWindow->setIcon( DesktopIcon("info") );
+ debugWindow->setIcon( DesktopIcon("application-vnd.tde.info") );
debugWindow->setCaption("Kexi Internal Debugger");
debugWindow->show();
return debugWindow;
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 294b7c0..ecf21be 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -344,7 +344,7 @@
connect(m_contents->printPreviewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(printPreview()));
m_contents->iconLabel->setFixedWidth(32+6);
- m_contents->iconLabel->setPixmap( DesktopIcon("document", 32) );
+ m_contents->iconLabel->setPixmap( DesktopIcon("text-x-generic", 32) );
TQWhatsThis::add(m_contents->headerTitleFontButton, i18n("Changes font for title text."));
connect(m_contents->headerTitleFontButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotChangeTitleFont()));
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index b887cdf..8f7682a 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -107,7 +107,7 @@
TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
setIcon( d->fileicon );
- d->dbicon = SmallIcon("database");
+ d->dbicon = SmallIcon("application-vnd.oasis.opendocument.database");
// list->setHScrollBarMode( TQScrollView::AlwaysOn );
if (!d->showConnectionColumns) {
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 5aebe3b..2b0666d 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -320,7 +320,7 @@
d->templatesSectionID_blank = itemID++;
TQString clickMsg( "\n\n" + i18n("Click \"OK\" button to proceed.") );
templPageFrame = d->templatesWidget->addPage(
- i18n("Blank Database"), i18n("New Blank Database Project"), DesktopIcon("empty") );
+ i18n("Blank Database"), i18n("New Blank Database Project"), DesktopIcon("application-x-zerosize") );
tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
TQLabel *lbl_blank = new TQLabel(
i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame );
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 11d711c..c53212f 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -501,7 +501,7 @@
KexiProject *prj = mainWin->project();
d->dataSourcePage->setProject(prj);
- tab->addTab( d->dataSourcePage, SmallIconSet("database"), "");
+ tab->addTab( d->dataSourcePage, SmallIconSet("application-vnd.oasis.opendocument.database"), "");
tab->setTabToolTip( d->dataSourcePage, i18n("Data Source"));
tab->addTab( d->objectTreeView, SmallIconSet("widgets"), "");
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index 3503622..57753a3 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -104,7 +104,7 @@
if(c == "Label")
return new Label(text, p, n);
else if(c == "PicLabel")
- return new PicLabel(DesktopIcon("image"), p, n);
+ return new PicLabel(DesktopIcon("image-x-generic"), p, n);
else if(c == "ReportLine")
return new ReportLine(p, n);
else if(c == "KexiSubReport")
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index df715cb..767b573 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -122,7 +122,7 @@
KexiTableViewColumn *col = new KexiTableViewColumn("pk", KexiDB::Field::Text, TQString(),
i18n("Additional information about the field"));
- col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("info"), d->view->palette() ) );
+ col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("application-vnd.tde.info"), d->view->palette() ) );
col->setHeaderTextVisible(false);
col->field()->setSubType("TDEIcon");
col->setReadOnly(true);
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 4f93a51..4655f75 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -98,7 +98,7 @@
void KivioOptionsDialog::initPage()
{
TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
- kapp->iconLoader()->loadIcon("empty", TDEIcon::Toolbar, 32));
+ kapp->iconLoader()->loadIcon(""application-x-zerosize", TDEIcon::Toolbar, 32));
m_pageIndex = pageIndex(page);
KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));
diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc
index 384c4ab..c7f3307 100644
--- a/kplato/kptconfigdialog.cc
+++ b/kplato/kptconfigdialog.cc
@@ -52,10 +52,10 @@
m_config(config)
{
-/* TQVBox *page = addVBoxPage(i18n("Behavior"), i18n("Behavior"), loadIcon("misc"));
+/* TQVBox *page = addVBoxPage(i18n("Behavior"), i18n("Behavior"), loadIcon(""application-vnd.tde.misc"));
m_behaviorPage = new ConfigBehaviorPanel(config.behavior(), page);*/
- TQVBox *page = addVBoxPage(i18n("Task Defaults"), i18n("Task Defaults"), loadIcon("misc"));
+ TQVBox *page = addVBoxPage(i18n("Task Defaults"), i18n("Task Defaults"), loadIcon(""application-vnd.tde.misc"));
m_taskDefaultPage = new TaskDefaultPanel(config.taskDefaults(), project.standardWorktime(), page);
enableButtonOK(false);
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 17a493e..ba1ae44 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -102,7 +102,7 @@
_miscPage=new KPrConfigureMiscPage(parent, page);
page = addVBoxPage( i18n("Document"), i18n("Document Settings"),
- BarIcon("kpresenter_kpr", TDEIcon::SizeMedium) );
+ BarIcon("application-x-kpresenter", TDEIcon::SizeMedium) );
_defaultDocPage=new KPrConfigureDefaultDocPage(parent, page);
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index 45c136e..70665c0 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -89,7 +89,7 @@
m_interfacePage=new ConfigureInterfacePage(parent, page2);
TQVBox *page4 = addVBoxPage( i18n("Document"), i18n("Document Settings"),
- loadIcon("kword_kwd") );
+ loadIcon(""x-office-document") );
m_defaultDocPage=new ConfigureDefaultDocPage(parent, page4);
@@ -103,7 +103,7 @@
this, KWFactory::instance()->config(), page5 );
TQVBox *page3 = addVBoxPage( i18n("Misc"), i18n("Misc Settings"),
- loadIcon("misc") );
+ loadIcon(""application-vnd.tde.misc") );
m_miscPage=new ConfigureMiscPage(parent, page3);
TQVBox *page6 = addVBoxPage( i18n("Path"), i18n("Path Settings"),
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
index 7ce33ed..43b203b 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.chart
Patterns=*.odc;*.ODC
-Icon=kchart_chrt
+Icon=application-x-kchart
Comment=OASIS OpenDocument Chart
Comment[bg]=���������������� ���� OASIS OpenDocument
Comment[br]=Treser grafo�� OpenDocument OASIS
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
index 4b5ab71..035a004 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.graphics-template
Patterns=*.otg;*.OTG
-Icon=drawing
+Icon=application-vnd.oasis.opendocument.graphics
Comment=OASIS OpenDocument Graphics Template
Comment[bg]=������������ ���� �������������� ���� OASIS OpenDocument
Comment[br]=Patrom skeudenn OpenOffice.org OASIS
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop
index 33cf63a..2da95fc 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop
** Diff limit reached (max: 250 lines) **
|
||