Quellcode durchsuchen

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

tags/r14.0.0
Timothy Pearson vor 4 Jahren
Ursprung
Commit
4d065be81f
30 geänderte Dateien mit 32 neuen und 32 gelöschten Zeilen
  1. 1
    1
      chalk/ui/layerlist.cpp
  2. 1
    1
      karbon/dialogs/vconfiguredlg.cc
  3. 1
    1
      kexi/data/trinity4compat/x-sqlite2.desktop
  4. 1
    1
      kexi/data/trinity4compat/x-sqlite3.desktop
  5. 1
    1
      kexi/formeditor/factories/stdwidgetfactory.cpp
  6. 1
    1
      kexi/kexiutils/debuggui.cpp
  7. 1
    1
      kexi/main/printing/kexisimpleprintingpagesetup.cpp
  8. 1
    1
      kexi/main/startup/KexiProjectSelector.cpp
  9. 1
    1
      kexi/main/startup/KexiStartupDialog.cpp
  10. 1
    1
      kexi/plugins/forms/kexiformpart.cpp
  11. 1
    1
      kexi/plugins/reports/kexireportfactory.cpp
  12. 1
    1
      kexi/plugins/tables/kexitabledesignerview.cpp
  13. 1
    1
      kivio/kiviopart/ui/kiviooptionsdialog.cpp
  14. 2
    2
      kplato/kptconfigdialog.cc
  15. 1
    1
      kpresenter/KPrConfig.cpp
  16. 2
    2
      kword/KWConfig.cpp
  17. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
  18. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
  19. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop
  20. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop
  21. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop
  22. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop
  23. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop
  24. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop
  25. 1
    1
      mimetypes/trinity3/vnd.oasis.opendocument.text.desktop
  26. 1
    1
      mimetypes/trinity51/x-raw.desktop
  27. 1
    1
      templates/Illustration.desktop
  28. 1
    1
      templates/Presentation.desktop
  29. 1
    1
      templates/SpreadSheet.desktop
  30. 1
    1
      templates/TextDocument.desktop

+ 1
- 1
chalk/ui/layerlist.cpp Datei anzeigen

@@ -733,7 +733,7 @@ void LayerList::constructMenu( LayerItem *layer )
733 733
         for( int i = 0, n = d->properties.count(); i < n; ++i )
734 734
             if( !layer->isFolder() || d->properties[i].validForFolders )
735 735
                 d->contextMenu.insertItem( layer->d->properties[i] ? d->properties[i].enabledIcon : d->properties[i].disabledIcon, d->properties[i].displayName, MenuItems::COUNT + i );
736
-        d->contextMenu.insertItem( SmallIconSet( "info" ), i18n( "&Properties" ), MenuItems::LayerProperties );
736
+        d->contextMenu.insertItem( SmallIconSet( "application-vnd.tde.info" ), i18n( "&Properties" ), MenuItems::LayerProperties );
737 737
         d->contextMenu.insertSeparator();
738 738
         d->contextMenu.insertItem( SmallIconSet( "edit-delete" ),
739 739
             selectedLayers().count() > 1 ? i18n( "Remove Layers" )

+ 1
- 1
karbon/dialogs/vconfiguredlg.cc Datei anzeigen

@@ -71,7 +71,7 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent )
71 71
 
72 72
 	page = addVBoxPage(
73 73
 			   i18n( "Document" ), i18n( "Document Settings" ),
74
-			   BarIcon( "document", TDEIcon::SizeMedium ) );
74
+			   BarIcon( "text-x-generic", TDEIcon::SizeMedium ) );
75 75
 
76 76
 	m_defaultDocPage = new VConfigDefaultPage( parent, page );
77 77
 	connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );

+ 1
- 1
kexi/data/trinity4compat/x-sqlite2.desktop Datei anzeigen

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Type=MimeType
3 3
 MimeType=application/x-sqlite2
4
-Icon=empty
4
+Icon=application-x-zerosize
5 5
 Patterns=
6 6
 Comment=SQLite2 Database File
7 7
 Comment[bg]=Файл на SQLite2

+ 1
- 1
kexi/data/trinity4compat/x-sqlite3.desktop Datei anzeigen

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Type=MimeType
3 3
 MimeType=application/x-sqlite3
4
-Icon=empty
4
+Icon=application-x-zerosize
5 5
 Patterns=
6 6
 Comment=SQLite3 Database File
7 7
 Comment[bg]=Файл на SQLite3

+ 1
- 1
kexi/formeditor/factories/stdwidgetfactory.cpp Datei anzeigen

@@ -388,7 +388,7 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
388 388
 	if(c == TQLABEL_OBJECT_NAME_STRING)
389 389
 		w = new TQLabel(text, p, n);
390 390
 	else if(c == "KexiPictureLabel")
391
-		w = new KexiPictureLabel(DesktopIcon("image"), p, n);
391
+		w = new KexiPictureLabel(DesktopIcon("image-x-generic"), p, n);
392 392
 
393 393
 	else if(c == "KLineEdit")
394 394
 	{

+ 1
- 1
kexi/kexiutils/debuggui.cpp Datei anzeigen

@@ -46,7 +46,7 @@ TQWidget *KexiUtils::createDebugWindow(TQWidget *parent)
46 46
 	debugWindowTab = new KTabWidget(debugWindow, "debugWindowTab");
47 47
 	lyr->addWidget( debugWindowTab );
48 48
 	debugWindow->resize(900, 600);
49
-	debugWindow->setIcon( DesktopIcon("info") );
49
+	debugWindow->setIcon( DesktopIcon("application-vnd.tde.info") );
50 50
 	debugWindow->setCaption("Kexi Internal Debugger");
51 51
 	debugWindow->show();
52 52
 	return debugWindow;

+ 1
- 1
kexi/main/printing/kexisimpleprintingpagesetup.cpp Datei anzeigen

@@ -344,7 +344,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
344 344
 	connect(m_contents->printPreviewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(printPreview()));
345 345
 
346 346
 	m_contents->iconLabel->setFixedWidth(32+6);
347
-	m_contents->iconLabel->setPixmap( DesktopIcon("document", 32) );
347
+	m_contents->iconLabel->setPixmap( DesktopIcon("text-x-generic", 32) );
348 348
 	TQWhatsThis::add(m_contents->headerTitleFontButton, i18n("Changes font for title text."));
349 349
 	connect(m_contents->headerTitleFontButton, TQT_SIGNAL(clicked()), 
350 350
 		this, TQT_SLOT(slotChangeTitleFont()));

+ 1
- 1
kexi/main/startup/KexiProjectSelector.cpp Datei anzeigen

@@ -107,7 +107,7 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget(
107 107
 	TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
108 108
 	d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
109 109
 	setIcon( d->fileicon );
110
-	d->dbicon = SmallIcon("database");
110
+	d->dbicon = SmallIcon("application-vnd.oasis.opendocument.database");
111 111
 //	list->setHScrollBarMode( TQScrollView::AlwaysOn );
112 112
 
113 113
 	if (!d->showConnectionColumns) {

+ 1
- 1
kexi/main/startup/KexiStartupDialog.cpp Datei anzeigen

@@ -320,7 +320,7 @@ void KexiStartupDialog::setupPageTemplates()
320 320
 	d->templatesSectionID_blank = itemID++;
321 321
 	TQString clickMsg( "\n\n" + i18n("Click \"OK\" button to proceed.") );
322 322
 	templPageFrame = d->templatesWidget->addPage(
323
-		i18n("Blank Database"), i18n("New Blank Database Project"), DesktopIcon("empty") );
323
+		i18n("Blank Database"), i18n("New Blank Database Project"), DesktopIcon("application-x-zerosize") );
324 324
 	tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
325 325
 	TQLabel *lbl_blank = new TQLabel( 
326 326
 		i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame );

+ 1
- 1
kexi/plugins/forms/kexiformpart.cpp Datei anzeigen

@@ -501,7 +501,7 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow*
501 501
 	KexiProject *prj = mainWin->project();
502 502
 	d->dataSourcePage->setProject(prj);
503 503
 
504
-	tab->addTab( d->dataSourcePage, SmallIconSet("database"), "");
504
+	tab->addTab( d->dataSourcePage, SmallIconSet("application-vnd.oasis.opendocument.database"), "");
505 505
 	tab->setTabToolTip( d->dataSourcePage, i18n("Data Source"));
506 506
 
507 507
 	tab->addTab( d->objectTreeView, SmallIconSet("widgets"), "");

+ 1
- 1
kexi/plugins/reports/kexireportfactory.cpp Datei anzeigen

@@ -104,7 +104,7 @@ KexiReportFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
104 104
 	if(c == "Label")
105 105
 		return new Label(text, p, n);
106 106
 	else if(c == "PicLabel")
107
-		return new PicLabel(DesktopIcon("image"), p, n);
107
+		return new PicLabel(DesktopIcon("image-x-generic"), p, n);
108 108
 	else if(c == "ReportLine")
109 109
 		return new ReportLine(p, n);
110 110
 	else if(c == "KexiSubReport")

+ 1
- 1
kexi/plugins/tables/kexitabledesignerview.cpp Datei anzeigen

@@ -122,7 +122,7 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
122 122
 
123 123
 	KexiTableViewColumn *col = new KexiTableViewColumn("pk", KexiDB::Field::Text, TQString(),
124 124
 		i18n("Additional information about the field"));
125
-	col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("info"), d->view->palette() ) );
125
+	col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("application-vnd.tde.info"), d->view->palette() ) );
126 126
 	col->setHeaderTextVisible(false);
127 127
 	col->field()->setSubType("TDEIcon");
128 128
 	col->setReadOnly(true);

+ 1
- 1
kivio/kiviopart/ui/kiviooptionsdialog.cpp Datei anzeigen

@@ -98,7 +98,7 @@ KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name)
98 98
 void KivioOptionsDialog::initPage()
99 99
 {
100 100
   TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
101
-    kapp->iconLoader()->loadIcon("empty", TDEIcon::Toolbar, 32));
101
+    kapp->iconLoader()->loadIcon(""application-x-zerosize", TDEIcon::Toolbar, 32));
102 102
   m_pageIndex = pageIndex(page);
103 103
 
104 104
   KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));

+ 2
- 2
kplato/kptconfigdialog.cc Datei anzeigen

@@ -52,10 +52,10 @@ ConfigDialog::ConfigDialog(Config &config, Project &project, TQWidget *parent, c
52 52
       m_config(config)
53 53
 {
54 54
 
55
-/*    TQVBox *page = addVBoxPage(i18n("Behavior"), i18n("Behavior"), loadIcon("misc"));
55
+/*    TQVBox *page = addVBoxPage(i18n("Behavior"), i18n("Behavior"), loadIcon(""application-vnd.tde.misc"));
56 56
     m_behaviorPage = new ConfigBehaviorPanel(config.behavior(), page);*/
57 57
     
58
-    TQVBox *page = addVBoxPage(i18n("Task Defaults"), i18n("Task Defaults"), loadIcon("misc"));
58
+    TQVBox *page = addVBoxPage(i18n("Task Defaults"), i18n("Task Defaults"), loadIcon(""application-vnd.tde.misc"));
59 59
     m_taskDefaultPage = new TaskDefaultPanel(config.taskDefaults(), project.standardWorktime(), page);
60 60
     
61 61
     enableButtonOK(false);

+ 1
- 1
kpresenter/KPrConfig.cpp Datei anzeigen

@@ -102,7 +102,7 @@ KPrConfig::KPrConfig( KPrView* parent )
102 102
     _miscPage=new KPrConfigureMiscPage(parent, page);
103 103
 
104 104
     page = addVBoxPage( i18n("Document"), i18n("Document Settings"),
105
-                        BarIcon("kpresenter_kpr", TDEIcon::SizeMedium) );
105
+                        BarIcon("application-x-kpresenter", TDEIcon::SizeMedium) );
106 106
 
107 107
     _defaultDocPage=new KPrConfigureDefaultDocPage(parent, page);
108 108
 

+ 2
- 2
kword/KWConfig.cpp Datei anzeigen

@@ -89,7 +89,7 @@ KWConfig::KWConfig( KWView* parent )
89 89
   m_interfacePage=new ConfigureInterfacePage(parent, page2);
90 90
 
91 91
   TQVBox *page4 = addVBoxPage( i18n("Document"), i18n("Document Settings"),
92
-                              loadIcon("kword_kwd") );
92
+                              loadIcon(""x-office-document") );
93 93
 
94 94
   m_defaultDocPage=new ConfigureDefaultDocPage(parent, page4);
95 95
 
@@ -103,7 +103,7 @@ KWConfig::KWConfig( KWView* parent )
103 103
                                              this, KWFactory::instance()->config(), page5 );
104 104
 
105 105
   TQVBox *page3 = addVBoxPage( i18n("Misc"), i18n("Misc Settings"),
106
-                              loadIcon("misc") );
106
+                              loadIcon(""application-vnd.tde.misc") );
107 107
   m_miscPage=new ConfigureMiscPage(parent, page3);
108 108
 
109 109
   TQVBox *page6 = addVBoxPage( i18n("Path"), i18n("Path Settings"),

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.chart
4 4
 Patterns=*.odc;*.ODC
5
-Icon=kchart_chrt
5
+Icon=application-x-kchart
6 6
 Comment=OASIS OpenDocument Chart
7 7
 Comment[bg]=Диаграма на OASIS OpenDocument
8 8
 Comment[br]=Treser grafoù OpenDocument OASIS

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.graphics-template
4 4
 Patterns=*.otg;*.OTG
5
-Icon=drawing
5
+Icon=application-vnd.oasis.opendocument.graphics
6 6
 Comment=OASIS OpenDocument Graphics Template
7 7
 Comment[bg]=Шаблон за графика на OASIS OpenDocument
8 8
 Comment[br]=Patrom skeudenn OpenOffice.org OASIS

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.graphics
4 4
 Patterns=*.odg;*.ODG
5
-Icon=drawing
5
+Icon=application-vnd.oasis.opendocument.graphics
6 6
 Comment=OASIS OpenDocument Graphics
7 7
 Comment[bg]=Графика на OASIS OpenDocument
8 8
 Comment[br]=Skeudenn OpenOffice.org OASIS

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.presentation-template
4 4
 Patterns=*.otp;*.OTP
5
-Icon=presentation
5
+Icon=application-vnd.oasis.opendocument.presentation
6 6
 Comment=OASIS OpenDocument Presentation Template
7 7
 Comment[bg]=Шаблон за презентация на OASIS OpenDocument
8 8
 Comment[br]=Patrom un emginnig OASIS OpenDocument

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.presentation
4 4
 Patterns=*.odp;*.ODP
5
-Icon=presentation
5
+Icon=application-vnd.oasis.opendocument.presentation
6 6
 Comment=OASIS OpenDocument Presentation
7 7
 Comment[bg]=Презентация на OASIS OpenDocument
8 8
 Comment[br]=Emginnig OASIS OpenDocument

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.spreadsheet-template
4 4
 Patterns=*.ots;*.OTS
5
-Icon=spreadsheet
5
+Icon=application-vnd.oasis.opendocument.spreadsheet
6 6
 Comment=OASIS OpenDocument SpreadSheet Template
7 7
 Comment[bg]=Шаблон за електронна таблица на OASIS OpenDocument
8 8
 Comment[br]=Patrom loger OpenOffice.org OASIS

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.spreadsheet
4 4
 Patterns=*.ods;*.ODS
5
-Icon=spreadsheet
5
+Icon=application-vnd.oasis.opendocument.spreadsheet
6 6
 Comment=OASIS OpenDocument SpreadSheet
7 7
 Comment[bg]=Електронна таблица на OASIS OpenDocument
8 8
 Comment[br]=Loger OpenOffice.org OASIS

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.text-template
4 4
 Patterns=*.ott;*.OTT
5
-Icon=wordprocessing
5
+Icon=application-vnd.oasis.opendocument.text
6 6
 Comment=OASIS OpenDocument Text Template
7 7
 Comment[bg]=Текстов шаблон на OASIS OpenDocument
8 8
 Comment[br]=Patrom skrid OpenOffice.org OASIS

+ 1
- 1
mimetypes/trinity3/vnd.oasis.opendocument.text.desktop Datei anzeigen

@@ -2,7 +2,7 @@
2 2
 Type=MimeType
3 3
 MimeType=application/vnd.oasis.opendocument.text
4 4
 Patterns=*.odt;*.ODT
5
-Icon=wordprocessing
5
+Icon=application-vnd.oasis.opendocument.text
6 6
 Comment=OASIS OpenDocument Text
7 7
 Comment[bg]=Текстов документ на OASIS OpenDocument
8 8
 Comment[br]=Skrid OpenDocument OASIS

+ 1
- 1
mimetypes/trinity51/x-raw.desktop Datei anzeigen

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Type=MimeType
3 3
 MimeType=image/x-raw
4
-Icon=image
4
+Icon=image-x-generic
5 5
 Patterns=*.raw;*.RAW;*.dcr;*.DCR;*.dng;*.DNG;*.crw;*.CRW;*.cr2,*.CR2;*.nef;*.NEF;*.mrw;*.MRW;
6 6
 Comment=RAW Camera Image
7 7
 Comment[bg]=RAW изображение от камера

+ 1
- 1
templates/Illustration.desktop Datei anzeigen

@@ -105,4 +105,4 @@ Comment[zh_CN]=新建 Karbon14 文档:
105 105
 Comment[zh_TW]=新增 Karbon14 文件:
106 106
 Type=Link
107 107
 URL=.source/Illustration.karbon
108
-Icon=karbon_karbon
108
+Icon=application-x-karbon

+ 1
- 1
templates/Presentation.desktop Datei anzeigen

@@ -110,4 +110,4 @@ Comment[zh_CN]=新建 KPresenter 演示文档:
110 110
 Comment[zh_TW]=新建 KPresenter 簡報文件:
111 111
 Type=Link
112 112
 URL=.source/Presentation.kpt
113
-Icon=kpresenter_kpr
113
+Icon=application-x-kpresenter

+ 1
- 1
templates/SpreadSheet.desktop Datei anzeigen

@@ -113,4 +113,4 @@ Comment[zh_CN]=新建 KSpread 文档:
113 113
 Comment[zh_TW]=新建 KSpread 文件:
114 114
 Type=Link
115 115
 URL=.source/SpreadSheet.kst
116
-Icon=kspread_ksp
116
+Icon=application-x-kspread

+ 1
- 1
templates/TextDocument.desktop Datei anzeigen

@@ -115,4 +115,4 @@ Comment[zh_CN]=新建 KWord 文档:
115 115
 Comment[zh_TW]=新建 KWord 文件;
116 116
 Type=Link
117 117
 URL=.source/TextDocument.kwt
118
-Icon=kword_kwd
118
+Icon=x-office-document

Laden…
Abbrechen
Speichern