From c0dd922a9815ca9c74b60c3aaa91a8474bfc757f Mon Sep 17 00:00:00 2001 From: Eitot Date: Sun, 2 Apr 2017 02:21:22 +0200 Subject: [PATCH 1/4] Move Dock menu to Interface Builder --- Interfaces/Base.lproj/MainMenu.xib | 20 +++++++++++++++++++- Interfaces/cs.lproj/MainMenu.strings | 6 ++++++ Interfaces/da.lproj/MainMenu.strings | 6 ++++++ Interfaces/de.lproj/MainMenu.strings | 6 ++++++ Interfaces/es.lproj/MainMenu.strings | 6 ++++++ Interfaces/eu.lproj/MainMenu.strings | 6 ++++++ Interfaces/fr.lproj/MainMenu.strings | 6 ++++++ Interfaces/gl.lproj/MainMenu.strings | 6 ++++++ Interfaces/it.lproj/MainMenu.strings | 6 ++++++ Interfaces/ja.lproj/MainMenu.strings | 6 ++++++ Interfaces/ko.lproj/MainMenu.strings | 6 ++++++ Interfaces/nl.lproj/MainMenu.strings | 6 ++++++ Interfaces/pt-BR.lproj/MainMenu.strings | 6 ++++++ Interfaces/pt.lproj/MainMenu.strings | 6 ++++++ Interfaces/ru.lproj/MainMenu.strings | 6 ++++++ Interfaces/sv.lproj/MainMenu.strings | 6 ++++++ Interfaces/tr.lproj/MainMenu.strings | 6 ++++++ Interfaces/uk.lproj/MainMenu.strings | 6 ++++++ Interfaces/zh-Hans.lproj/MainMenu.strings | 6 ++++++ Interfaces/zh-Hant.lproj/MainMenu.strings | 6 ++++++ src/AppController.h | 1 - src/AppController.m | 14 -------------- 22 files changed, 133 insertions(+), 16 deletions(-) diff --git a/Interfaces/Base.lproj/MainMenu.xib b/Interfaces/Base.lproj/MainMenu.xib index 3748c333d8..9911bf8a19 100644 --- a/Interfaces/Base.lproj/MainMenu.xib +++ b/Interfaces/Base.lproj/MainMenu.xib @@ -10,6 +10,7 @@ + @@ -351,7 +352,7 @@ - + @@ -1140,6 +1141,23 @@ CA + + + + + + + + + + + + + + + + + diff --git a/Interfaces/cs.lproj/MainMenu.strings b/Interfaces/cs.lproj/MainMenu.strings index 479579a11a..460906743b 100644 --- a/Interfaces/cs.lproj/MainMenu.strings +++ b/Interfaces/cs.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Obnovit všechna odebírání"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Označit všechna odebírání jako čtená"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Pravopis"; diff --git a/Interfaces/da.lproj/MainMenu.strings b/Interfaces/da.lproj/MainMenu.strings index 42a2bdda5a..f95564f3a1 100644 --- a/Interfaces/da.lproj/MainMenu.strings +++ b/Interfaces/da.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Opdater alle abonnementer"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Marker alle abonnementer som læst"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Stavekontrol"; diff --git a/Interfaces/de.lproj/MainMenu.strings b/Interfaces/de.lproj/MainMenu.strings index b7ef02b251..9a63d09082 100644 --- a/Interfaces/de.lproj/MainMenu.strings +++ b/Interfaces/de.lproj/MainMenu.strings @@ -376,6 +376,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Indiziere Datenbank"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Alle Abonnements aktualisieren"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Alle Abonnements als gelesen markieren"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Rechtschreibung"; diff --git a/Interfaces/es.lproj/MainMenu.strings b/Interfaces/es.lproj/MainMenu.strings index 21a9791ec4..946d836250 100644 --- a/Interfaces/es.lproj/MainMenu.strings +++ b/Interfaces/es.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Volver a indexar base de datos"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Actualizar todas las suscripciones"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Marcar todas las suscripciones como leídas"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Ortografía"; diff --git a/Interfaces/eu.lproj/MainMenu.strings b/Interfaces/eu.lproj/MainMenu.strings index 2588f723e8..512d596912 100644 --- a/Interfaces/eu.lproj/MainMenu.strings +++ b/Interfaces/eu.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Eguneratu Harpidetza Guztiak"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Jarri harpidetza guztiak irakurrita moduan"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Idazkera"; diff --git a/Interfaces/fr.lproj/MainMenu.strings b/Interfaces/fr.lproj/MainMenu.strings index bc911024ba..98d5fe6c87 100644 --- a/Interfaces/fr.lproj/MainMenu.strings +++ b/Interfaces/fr.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Réindexer la base de données"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Rafraîchir tous les abonnements"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Marquer tous les abonnements comme lu"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Orthographe"; diff --git a/Interfaces/gl.lproj/MainMenu.strings b/Interfaces/gl.lproj/MainMenu.strings index 6c97a5c691..8f762893f2 100644 --- a/Interfaces/gl.lproj/MainMenu.strings +++ b/Interfaces/gl.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Volver a indexar a base de datos"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Actualizar todas as subscricións"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Marcar todas as subscricións como lidas"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Ortografía"; diff --git a/Interfaces/it.lproj/MainMenu.strings b/Interfaces/it.lproj/MainMenu.strings index c0d925c460..962ddd0091 100644 --- a/Interfaces/it.lproj/MainMenu.strings +++ b/Interfaces/it.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Aggiorna Tutte Le Iscrizioni"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Segnala Tutte le Iscrizioni come Lette"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Ortografia"; diff --git a/Interfaces/ja.lproj/MainMenu.strings b/Interfaces/ja.lproj/MainMenu.strings index ae534b5f37..7222f43c7b 100644 --- a/Interfaces/ja.lproj/MainMenu.strings +++ b/Interfaces/ja.lproj/MainMenu.strings @@ -380,6 +380,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "すべての購読を更新"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "すべての購読を既読にする"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "スペル"; diff --git a/Interfaces/ko.lproj/MainMenu.strings b/Interfaces/ko.lproj/MainMenu.strings index 45e4a1a344..ff490fb93e 100644 --- a/Interfaces/ko.lproj/MainMenu.strings +++ b/Interfaces/ko.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "모든 구독 갱신"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "모든 구독을 읽음으로 표시"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "철자 검사"; diff --git a/Interfaces/nl.lproj/MainMenu.strings b/Interfaces/nl.lproj/MainMenu.strings index eb5398b585..cf579a676f 100644 --- a/Interfaces/nl.lproj/MainMenu.strings +++ b/Interfaces/nl.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Werk alle abonnementen bij"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Markeer alle abonnementen als gelezen"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Spelling"; diff --git a/Interfaces/pt-BR.lproj/MainMenu.strings b/Interfaces/pt-BR.lproj/MainMenu.strings index 589c499408..803465f1bb 100644 --- a/Interfaces/pt-BR.lproj/MainMenu.strings +++ b/Interfaces/pt-BR.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindexando banco de dados"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Atualizar Todas as Assinaturas"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Marcar Todas as Assinaturas como Lidas"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Ortografia"; diff --git a/Interfaces/pt.lproj/MainMenu.strings b/Interfaces/pt.lproj/MainMenu.strings index 492ee086d3..9f9562d6b5 100644 --- a/Interfaces/pt.lproj/MainMenu.strings +++ b/Interfaces/pt.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Actualizar Todas as Subscrições"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Marcar Todas as Subscrições como Lidas"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Ortografia"; diff --git a/Interfaces/ru.lproj/MainMenu.strings b/Interfaces/ru.lproj/MainMenu.strings index 6f3b77ded8..c2d7edbf5e 100644 --- a/Interfaces/ru.lproj/MainMenu.strings +++ b/Interfaces/ru.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Проиндексировать базу данных"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Обновить все подписки"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Отметить все подписки как прочитанные"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Правописание"; diff --git a/Interfaces/sv.lproj/MainMenu.strings b/Interfaces/sv.lproj/MainMenu.strings index e2f3ed9d13..ec40684748 100644 --- a/Interfaces/sv.lproj/MainMenu.strings +++ b/Interfaces/sv.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Uppdatera alla prenumerationer"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Markera alla prenumerationer som lästa"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Stavning"; diff --git a/Interfaces/tr.lproj/MainMenu.strings b/Interfaces/tr.lproj/MainMenu.strings index 6b8cd08927..e7e66f62c8 100644 --- a/Interfaces/tr.lproj/MainMenu.strings +++ b/Interfaces/tr.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Tüm Abonelikleri Yenile"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Tüm Abonelikleri Okundu Olarak İşaretle"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Yazım"; diff --git a/Interfaces/uk.lproj/MainMenu.strings b/Interfaces/uk.lproj/MainMenu.strings index a7d445c559..c586fab15f 100644 --- a/Interfaces/uk.lproj/MainMenu.strings +++ b/Interfaces/uk.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "Оновити всі підписки"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "Помітити всі підписки як прочинаті"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "Правопис"; diff --git a/Interfaces/zh-Hans.lproj/MainMenu.strings b/Interfaces/zh-Hans.lproj/MainMenu.strings index 6a74dd50a5..df19e50b3c 100644 --- a/Interfaces/zh-Hans.lproj/MainMenu.strings +++ b/Interfaces/zh-Hans.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "更新所有的频道"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "标记所有频道为已读"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "拼写"; diff --git a/Interfaces/zh-Hant.lproj/MainMenu.strings b/Interfaces/zh-Hant.lproj/MainMenu.strings index fbca52963f..53ebfe56e7 100644 --- a/Interfaces/zh-Hant.lproj/MainMenu.strings +++ b/Interfaces/zh-Hant.lproj/MainMenu.strings @@ -379,6 +379,12 @@ /* Class = "NSMenuItem"; title = "Reindex Database"; ObjectID = "1458"; */ "1458.title" = "Reindex Database"; +/* Class = "NSMenuItem"; title = "Refresh All Subscriptions"; ObjectID = "6yn-y8-lF1"; */ +"6yn-y8-lF1.title" = "重新整理所有訂閱頻道"; + +/* Class = "NSMenuItem"; title = "Mark All Subscriptions as Read"; ObjectID = "ecl-HO-Kpi"; */ +"ecl-HO-Kpi.title" = "將所有的訂閱頻道標示為已閱讀"; + /* Class = "NSMenu"; title = "Spelling"; ObjectID = "fad-Nj-OFI"; */ "fad-Nj-OFI.title" = "拼字檢查"; diff --git a/src/AppController.h b/src/AppController.h index 1dac8afd71..dc67fbec7c 100644 --- a/src/AppController.h +++ b/src/AppController.h @@ -87,7 +87,6 @@ Database * db; PluginManager * pluginManager; NSMutableDictionary * scriptPathMappings; - NSMenu * appDockMenu; NSStatusItem * appStatusItem; NSInteger progressCount; NSDictionary * standardURLs; diff --git a/src/AppController.m b/src/AppController.m index e96c7e43de..da6fc5cde7 100644 --- a/src/AppController.m +++ b/src/AppController.m @@ -904,20 +904,6 @@ - (void)getUrl:(NSAppleEventDescriptor *)event [self.rssFeed newSubscription:mainWindow underParent:foldersTree.groupParentSelection initialURL:urlStr]; } -#pragma mark Dock Menu - -/* applicationDockMenu - * Return a menu with additional commands to be displayd on the application's - * popup dock menu. - */ --(NSMenu *)applicationDockMenu:(NSApplication *)sender -{ - appDockMenu = [NSMenu new]; - [appDockMenu addItem:copyOfMenuItemWithAction(@selector(refreshAllSubscriptions:))]; - [appDockMenu addItem:copyOfMenuItemWithAction(@selector(markAllSubscriptionsRead:))]; - return appDockMenu; -} - /* contextMenuItemsForElement * Creates a new context menu for our web pane. */ From bc6941707910bdfa3a518716fd03fe2d309c0d4a Mon Sep 17 00:00:00 2001 From: Eitot Date: Sun, 2 Apr 2017 03:43:04 +0200 Subject: [PATCH 2/4] Restore default background of sidebar Sidebars are translucent in 10.10+. --- Resources/selBlue.tiff | Bin 202 -> 0 bytes Resources/selGray.tiff | Bin 200 -> 0 bytes Vienna.xcodeproj/project.pbxproj | 8 -------- src/AppController.m | 2 -- src/FolderView.h | 3 --- src/FolderView.m | 16 ---------------- src/FoldersTree.h | 1 - src/FoldersTree.m | 22 ++++------------------ 8 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 Resources/selBlue.tiff delete mode 100644 Resources/selGray.tiff diff --git a/Resources/selBlue.tiff b/Resources/selBlue.tiff deleted file mode 100644 index 39985e12eba04fe15a6ba160ddd537986877fd30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmebEWzb?^U~p@Y5zb4t3OtqOWy!PBTydhx6GN4lHj(BD2l@-APdsPz%Jf)Fzu3h- zrBk{`B3v!HUQ8DZ6?mwnct>>#vl$Zu7b61$GteAHAY@=OV diff --git a/Resources/selGray.tiff b/Resources/selGray.tiff deleted file mode 100644 index 32eed3cdaea8ee5775cc0eefb549ef90faa9542f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmebEWzb?^U~p;B4$l>Jx;vXSZRNEKQ#Tv>Y)#V)>p7})aoUo|O;@tbf;v-91+0nG z;uLC3IN^Wt@~Ll5r7_37HNrj!Ffed2GB7X$O<@E=21Z6GTL{Qz0<%GKhZvcm;;cY% rHYl43$QEQ^0qbR8;9wMjii6A%g|dOV8O7mhtQlnxYJmEHx @interface FolderView : NSOutlineView { - NSImage * blueGradient; - NSImage * grayGradient; - NSRect iRect; BOOL useTooltips; NSString * backupString; } diff --git a/src/FolderView.m b/src/FolderView.m index d63fe420ab..086bc38df6 100644 --- a/src/FolderView.m +++ b/src/FolderView.m @@ -54,14 +54,6 @@ -(instancetype)init */ -(void)awakeFromNib { - NSString * blueGradientURL = [[NSBundle mainBundle] pathForResource:@"selBlue" ofType:@"tiff"]; - blueGradient = [[NSImage alloc] initWithContentsOfFile: blueGradientURL ]; - - NSString * grayGradientURL = [[NSBundle mainBundle] pathForResource:@"selGray" ofType:@"tiff"]; - grayGradient = [[NSImage alloc] initWithContentsOfFile: grayGradientURL ]; - - iRect = NSMakeRect(0,0,1,blueGradient.size.height-1); - // Add the notifications for collapse and expand. NSNotificationCenter * nc = [NSNotificationCenter defaultCenter]; [nc addObserver:self selector:@selector(outlineViewItemDidExpand:) name:NSOutlineViewItemDidExpandNotification object:(id)self]; @@ -335,13 +327,6 @@ -(void)highlightSelectionInClipRect:(NSRect)rect NSRect selectedRect = [self rectOfRow:rowIndex]; if (NSIntersectsRect(selectedRect, rect)) { - [blueGradient drawInRect:selectedRect fromRect:iRect operation:NSCompositeSourceOver fraction:1 respectFlipped:YES hints:nil]; - - if (self.editedRow == -1) - { - if (self.window.firstResponder != self || !self.window.keyWindow) - [grayGradient drawInRect:selectedRect fromRect:iRect operation:NSCompositeSourceOver fraction:1 respectFlipped:YES hints:nil]; - } if (self.editedRow != -1) [self performSelector:@selector(prvtResizeTheFieldEditor) withObject:nil afterDelay:0.001]; } @@ -382,7 +367,6 @@ -(void)prvtResizeTheFieldEditor // Get rid of the white border, leftover from resizing the fieldEditor.. editRect.origin.x -= 6; editRect.size.width += 6; - [blueGradient drawInRect:editRect fromRect:iRect operation:NSCompositeSourceOver fraction:1 respectFlipped:YES hints:nil]; // Put back any cell image NSInteger editColumnIndex = self.editedColumn; diff --git a/src/FoldersTree.h b/src/FoldersTree.h index d08debe089..cc6f6cf847 100644 --- a/src/FoldersTree.h +++ b/src/FoldersTree.h @@ -50,7 +50,6 @@ -(BOOL)selectFolder:(NSInteger)folderId; -(void)renameFolder:(NSInteger)folderId; @property (nonatomic, readonly) NSInteger actualSelection; --(void)setOutlineViewBackgroundColor: (NSColor *)color; @property (nonatomic, readonly) NSInteger groupParentSelection; @property (nonatomic, readonly) NSInteger countOfSelectedFolders; @property (nonatomic, readonly, copy) NSArray *selectedFolders; diff --git a/src/FoldersTree.m b/src/FoldersTree.m index 9ad249fe33..fcfefe48df 100644 --- a/src/FoldersTree.m +++ b/src/FoldersTree.m @@ -98,9 +98,6 @@ -(void)awakeFromNib // Create and set whatever font we're using for the folders [self setFolderListFont]; - // Set background colour - outlineView.backgroundColor = [NSColor colorWithCalibratedRed:0.84 green:0.87 blue:0.90 alpha:1.00]; - // Allow a second click in a node to edit the node outlineView.action = @selector(handleSingleClick:); outlineView.doubleAction = @selector(handleDoubleClick:); @@ -123,15 +120,6 @@ -(void)awakeFromNib [outlineView accessibilitySetOverrideValue:NSLocalizedString(@"Folders", nil) forAttribute:NSAccessibilityDescriptionAttribute]; } -/* setOutlineViewBackgroundColor - * Sets the color of the background view. - */ - --(void)setOutlineViewBackgroundColor: (NSColor *)color; -{ - outlineView.backgroundColor = color; -} - /* initialiseFoldersTree * Do the things to initialize the folder tree from the database */ @@ -917,13 +905,11 @@ -(id)outlineView:(NSOutlineView *)olv objectValueForTableColumn:(NSTableColumn * } Folder * folder = node.folder; - NSInteger rowIndex = [olv rowForItem:item]; - NSMutableDictionary * myInfo = [NSMutableDictionary dictionaryWithDictionary:info]; - // Set the colour of the text in the cell : default is blackColor + NSMutableDictionary * myInfo = [NSMutableDictionary dictionaryWithDictionary:info]; if (IsUnsubscribed(folder)) - myInfo[NSForegroundColorAttributeName] = [NSColor grayColor]; - else if (olv.selectedRow == rowIndex && olv.editedRow != rowIndex) - myInfo[NSForegroundColorAttributeName] = [NSColor whiteColor]; + myInfo[NSForegroundColorAttributeName] = [NSColor secondaryLabelColor]; + else + myInfo[NSForegroundColorAttributeName] = [NSColor labelColor]; // Set the font if (folder.unreadCount || (folder.childUnreadCount && ![olv isItemExpanded:item])) myInfo[NSFontAttributeName] = boldCellFont; From 79047e5143c32ae48c498b4b0853a01d38cb84d1 Mon Sep 17 00:00:00 2001 From: Eitot Date: Thu, 16 Mar 2017 03:05:07 +0100 Subject: [PATCH 3/4] Remove unused outlets from AppController and MainMenu.xib --- Interfaces/Base.lproj/MainMenu.xib | 6 ------ src/AppController.h | 7 ------- 2 files changed, 13 deletions(-) diff --git a/Interfaces/Base.lproj/MainMenu.xib b/Interfaces/Base.lproj/MainMenu.xib index 9911bf8a19..a76d2a00e0 100644 --- a/Interfaces/Base.lproj/MainMenu.xib +++ b/Interfaces/Base.lproj/MainMenu.xib @@ -1161,7 +1161,6 @@ CA - @@ -1175,21 +1174,16 @@ CA - - - - - diff --git a/src/AppController.h b/src/AppController.h index dc67fbec7c..86be58d138 100644 --- a/src/AppController.h +++ b/src/AppController.h @@ -41,7 +41,6 @@ @class ClickableProgressIndicator; @class SearchPanel; @class BJRWindowWithToolbar; -@class TreeFilterView; @class DisclosureView; @class ViennaSparkleDelegate; @@ -49,12 +48,9 @@ { IBOutlet BJRWindowWithToolbar * mainWindow; IBOutlet ArticleController * articleController; - IBOutlet NSSplitView * splitView1; IBOutlet NSView * exportSaveAccessory; - IBOutlet NSView * searchView; IBOutlet NSSearchField * filterSearchField; IBOutlet NSPopUpButton * filterViewPopUp; - IBOutlet NSView * articleFrame; IBOutlet BrowserView * browserView; IBOutlet NSButtonCell * exportAll; IBOutlet NSButtonCell * exportSelected; @@ -69,10 +65,7 @@ IBOutlet NSMenuItem * columnsMenu; IBOutlet NSMenuItem * stylesMenu; IBOutlet NSMenuItem * filtersMenu; - IBOutlet FilterView * filterView; IBOutlet DisclosureView * filterDisclosureView; - IBOutlet TreeFilterView *treeFilterView; - IBOutlet TreeFilterView *treeFilterSearchField; IBOutlet DisclosureView *statusBarDisclosureView; IBOutlet NSTextField * currentFilterTextField; IBOutlet NSButton * filterIconInStatusBarButton; From e21ae93bdd0dd5d8f1da36ba2ac02ad6bee3a70a Mon Sep 17 00:00:00 2001 From: Eitot Date: Sun, 2 Apr 2017 04:16:19 +0200 Subject: [PATCH 4/4] Delete unused images --- Resources/DBListSplitViewBar.tiff | Bin 374 -> 0 bytes Resources/DBListSplitViewDimple.tiff | Bin 17116 -> 0 bytes Resources/draggerImage.png | Bin 342 -> 0 bytes Resources/metal_column_header.png | Bin 164 -> 0 bytes Vienna.xcodeproj/project.pbxproj | 16 ---------------- 5 files changed, 16 deletions(-) delete mode 100644 Resources/DBListSplitViewBar.tiff delete mode 100644 Resources/DBListSplitViewDimple.tiff delete mode 100644 Resources/draggerImage.png delete mode 100755 Resources/metal_column_header.png diff --git a/Resources/DBListSplitViewBar.tiff b/Resources/DBListSplitViewBar.tiff deleted file mode 100644 index b004a7e11394edda431341f5aeae204e0978c77f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmebEWzb?^VDMsKUckt}3}i9>|Ifg%fQf+x#0KF7%y2dbkk4@9#EH|VPhYrj;qv9n z*RNl{dGqG&+qduDy~`j3R1P))q>mA58Us)dBNJF0D95P5$c&_h4a#N$$_T=3F=7-# zQX>jwgLI2Q*sE3n+2U~Z5{yy|tPs~S>M=^g*=CF~Nakoj*&w?N8Gs~%ERbc#Xar`9 z0NF8&!C*BYn+n=9;pT&V4fF>PdO)mUfYFXA`AMk?0U7xv`NbLe1q#l=3ciWSnRy^C d1A~!)fti(og_WU^f}yFEk%g798PI4D1OQd6E-L^4 diff --git a/Resources/DBListSplitViewDimple.tiff b/Resources/DBListSplitViewDimple.tiff deleted file mode 100644 index cd3115053b7842e57be7c42defbd8841c4fc1c6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17116 zcmeGkTW}j!^{(WXWXG{$J4p-eY}_QuP^4YGY)d0M*s>kFVr`EBTjb;Watv*V~cd0VBIIY;;Rrh#@%d?AC=y^J!4QfbUMq0?im1^kF(c*2-2eR1Pu#R5 zjJfX(#o2fvCN4{}rxkJW^wA`LdW8=Q?!)8G=vrhgSICJPN3Z3wc{Q>&=H@W(2$V6H zanl4vTN!hoj3;PKma{98MhCpC$3OaUI<0UyaaC4UXrFi34FnY-9a)%~F~~t}%)P8> zg$To}uC97l172ClFurg&%&>mO@Am+PM_tcr+?pq^-UZx<7}Cjdx4h~l5_x$!$4Dm` zpOYN05hed3}#|s`hEyv-u3z>D45NrC1^TYhDBy2Rg;zV z@hGzqc5B4fq;%z;R~Ztwl!d+(mR#cs^=$|ZWkKjD)FLrO8x)zhS`81?Zd0(x*g4 zg+%Ju5ad{gXfe-2UMrs&8#L4q0KZPOP9ne%zaYM9K_Fs(AH_1}Y?Qlc+=)+ygoq z1nN`JB%DU~@;DatwG082~|;?sjvY8nwzn2fU^g zbIQ*r$9sBaoq%bU1a7kppICKNE4xnXd36)!JEnna#%FoXT6aQjP9s0))9FNf6ZOhI z)Cxb?6z24J%i%{Yrjq)Ss=&b_Z%N9hts)+&yE{J?(VN&+O z#*>K}H!QD|wzisSY?W)9okJtT-tZ`Vs>S*P!N5qUib3V!LxiZe6gNkH?E;`ln}awFsBc_C zf~6~KNc}UO0RBkMKU}qjY)G}HKo>smdrC)e?7 zPtY440T-+s)oy4kM?K*x=QNvXehB7yf zl^a(2<@rNXv9e-g;yy>=tK;qILL1e?4rHWrB~|ut!Rp*?!+X>6r@B#v7}*F)$Mf7a zo>ErEO#?kQdG@yElzK*=JQOW+$`41JwBB#BHdY zg@OPx%Z*RXZIBKyU3@bYTN49p0duu-Qzn|ma$_Pf2gyMEEktFKX-vUb*6W9b(bit| z!#lrIkc*g?`IQQx%3`4I+{6$;TQ68hq*dSD>{e zBExG0+DEu!Dp(4*l5cSilD6JTzr$yc{*}%S0)ySCXpLarR<7SksJ=<+4swPQrT21@ zI!KCfVE-sSoMp)gPy1U0I*XWe8d|b&?jR7#fIRi(uaqHvXra)3a5iy51mdYch&1m& z9iak3rMidxFSxmGQ|W(cBbMpHv=P=7^tOFM{~1=i6QGFfu+{BzJFeQX4!S>>!2za#xrq^=K7rsfiO*Yo0C$4F8>TEJTpMvd_m|&L) zu0nP!%gX7Atdub=wNqCfz6jF6(6dtz(_AsDLD6vv-n!O7$8VenxEj4Xm5Iq&*rZu8 zu1lvsd8FI`UC>cEk8SPHwP$KaclVCo9eusMeFMF{y#x5vJD_)QZG}MTr^wX>>a^LZA!Kt= zb{AFp9n`7P1?n(J*-nuI1jdIQlxu76=nV7!NcL8dbK zp}Y=I?HNxO$B>F!doFF{I^@8^_Tc|ICDB<&9n0?@y#Ar}4fii8JyEMEMPa8@k6UJ_ zIIVt=uq^-Qy;x+uP1Qwy=5}^tW(P#{!+xYy31TzvdVexlC$F zl;F!^nEJ6~g0gc9Ts&D!s`E_sjgOWiSZ3exm<0+Y+F^7(8A5T-G@yGywn^>W4i5 diff --git a/Resources/metal_column_header.png b/Resources/metal_column_header.png deleted file mode 100755 index 296bd718c4c506931263f68eb3969a8b643cb87a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{F!2~2D{x&@TQY`6?zK#qG*KS<#k1zuAB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%nR&W6hE&{g>E6i8V8C&B$)Ebf zoelhx4g|cobnsLH`^?UDP2y6U90Z@Z@4i&g`+ZB@eBnY?35E;edconx{^kNrVDNPH Kb6Mw<&;$Si@iwsl diff --git a/Vienna.xcodeproj/project.pbxproj b/Vienna.xcodeproj/project.pbxproj index 0cae547a4f..ed99d13030 100644 --- a/Vienna.xcodeproj/project.pbxproj +++ b/Vienna.xcodeproj/project.pbxproj @@ -233,7 +233,6 @@ AA077AAC0C84484B00D71D26 /* subscribeButtonSmallPressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA077A940C84484B00D71D26 /* subscribeButtonSmallPressed.tiff */; }; AA13A08B0C36D34C00C64338 /* filterViewBackground.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA13A08A0C36D34C00C64338 /* filterViewBackground.tiff */; }; AA167A850658361B0091365D /* ViennaApp.scriptSuite in Resources */ = {isa = PBXBuildFile; fileRef = AA167A840658361B0091365D /* ViennaApp.scriptSuite */; }; - AA16C2B10C2D57D5006BBAC1 /* draggerImage.png in Resources */ = {isa = PBXBuildFile; fileRef = AA16C2B00C2D57D5006BBAC1 /* draggerImage.png */; }; AA16C5450C2DD4EB006BBAC1 /* refreshProgress.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA16C5440C2DD4EB006BBAC1 /* refreshProgress.tiff */; }; AA18C4960C43F24900E11C0C /* browserBarBackground.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA18C4950C43F24900E11C0C /* browserBarBackground.tiff */; }; AA1A23DB0C07475B005968DC /* SplitViewExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = AA1A23D90C07475B005968DC /* SplitViewExtensions.m */; }; @@ -248,7 +247,6 @@ AA1A2A330C09D84E005968DC /* subscribeButtonPressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA1A2A320C09D84E005968DC /* subscribeButtonPressed.tiff */; }; AA1A2C300C0A1EC1005968DC /* emptyTrashButton.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA1A2C2F0C0A1EC1005968DC /* emptyTrashButton.tiff */; }; AA20DC9E0882CCC300A226F5 /* unread.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA20DC9D0882CCC300A226F5 /* unread.tiff */; }; - AA2185060861E7E10024DD4A /* metal_column_header.png in Resources */ = {isa = PBXBuildFile; fileRef = AA2185050861E7E10024DD4A /* metal_column_header.png */; }; AA26F448060490BE00FE7994 /* alphaPixel.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA26F435060490BD00FE7994 /* alphaPixel.tiff */; }; AA26F44D060490BE00FE7994 /* flagged_header.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA26F43A060490BD00FE7994 /* flagged_header.tiff */; }; AA26F44E060490BE00FE7994 /* flagged.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AA26F43B060490BD00FE7994 /* flagged.tiff */; }; @@ -301,8 +299,6 @@ AAB90EFD061D059D00CA4741 /* searchFolder.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AAB90EFC061D059D00CA4741 /* searchFolder.tiff */; }; AABCF9A508FF562E00984F78 /* pressedCloseButton.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AABCF9A408FF562E00984F78 /* pressedCloseButton.tiff */; }; AACAEA3E0954E71100ACD502 /* DemoFeeds.plist in Resources */ = {isa = PBXBuildFile; fileRef = AACAEA3D0954E71100ACD502 /* DemoFeeds.plist */; }; - AAD2BF620C2C41A200AA0F11 /* DBListSplitViewBar.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AAD2BF600C2C41A200AA0F11 /* DBListSplitViewBar.tiff */; }; - AAD2BF630C2C41A200AA0F11 /* DBListSplitViewDimple.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AAD2BF610C2C41A200AA0F11 /* DBListSplitViewDimple.tiff */; }; AAD794E7088A25D200E2CE5E /* PopUpButtonExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = AAD794E5088A25D200E2CE5E /* PopUpButtonExtensions.m */; }; AAD799A0088B617900E2CE5E /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AAD7999E088B617900E2CE5E /* ImageAndTextCell.m */; }; AADD6E820C457C3800E11097 /* getInfoButton.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AADD6E800C457C3800E11097 /* getInfoButton.tiff */; }; @@ -717,7 +713,6 @@ AA13A08A0C36D34C00C64338 /* filterViewBackground.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = filterViewBackground.tiff; path = Resources/filterViewBackground.tiff; sourceTree = SOURCE_ROOT; }; AA167A24065834DC0091365D /* ViennaApp.scriptTerminology */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.scriptTerminology; name = ViennaApp.scriptTerminology; path = Resources/ViennaApp.scriptTerminology; sourceTree = SOURCE_ROOT; }; AA167A840658361B0091365D /* ViennaApp.scriptSuite */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.scriptSuite; name = ViennaApp.scriptSuite; path = Resources/ViennaApp.scriptSuite; sourceTree = SOURCE_ROOT; }; - AA16C2B00C2D57D5006BBAC1 /* draggerImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = draggerImage.png; path = Resources/draggerImage.png; sourceTree = SOURCE_ROOT; }; AA16C5440C2DD4EB006BBAC1 /* refreshProgress.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = refreshProgress.tiff; path = Resources/refreshProgress.tiff; sourceTree = SOURCE_ROOT; }; AA18C4950C43F24900E11C0C /* browserBarBackground.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = browserBarBackground.tiff; path = Resources/browserBarBackground.tiff; sourceTree = SOURCE_ROOT; }; AA1A23D80C07475B005968DC /* SplitViewExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplitViewExtensions.h; path = src/SplitViewExtensions.h; sourceTree = SOURCE_ROOT; }; @@ -733,7 +728,6 @@ AA1A2A320C09D84E005968DC /* subscribeButtonPressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = subscribeButtonPressed.tiff; path = Resources/subscribeButtonPressed.tiff; sourceTree = SOURCE_ROOT; }; AA1A2C2F0C0A1EC1005968DC /* emptyTrashButton.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = emptyTrashButton.tiff; path = Resources/emptyTrashButton.tiff; sourceTree = SOURCE_ROOT; }; AA20DC9D0882CCC300A226F5 /* unread.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = unread.tiff; path = Resources/unread.tiff; sourceTree = SOURCE_ROOT; }; - AA2185050861E7E10024DD4A /* metal_column_header.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = metal_column_header.png; path = Resources/metal_column_header.png; sourceTree = SOURCE_ROOT; }; AA26F435060490BD00FE7994 /* alphaPixel.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = alphaPixel.tiff; path = Resources/alphaPixel.tiff; sourceTree = SOURCE_ROOT; }; AA26F43A060490BD00FE7994 /* flagged_header.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = flagged_header.tiff; path = Resources/flagged_header.tiff; sourceTree = SOURCE_ROOT; }; AA26F43B060490BD00FE7994 /* flagged.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = flagged.tiff; path = Resources/flagged.tiff; sourceTree = SOURCE_ROOT; }; @@ -804,8 +798,6 @@ AAB90EFC061D059D00CA4741 /* searchFolder.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = searchFolder.tiff; path = Resources/searchFolder.tiff; sourceTree = SOURCE_ROOT; }; AABCF9A408FF562E00984F78 /* pressedCloseButton.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = pressedCloseButton.tiff; path = Resources/pressedCloseButton.tiff; sourceTree = SOURCE_ROOT; }; AACAEA3D0954E71100ACD502 /* DemoFeeds.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DemoFeeds.plist; path = Resources/DemoFeeds.plist; plistStructureDefinitionIdentifier = ""; sourceTree = SOURCE_ROOT; }; - AAD2BF600C2C41A200AA0F11 /* DBListSplitViewBar.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = DBListSplitViewBar.tiff; path = Resources/DBListSplitViewBar.tiff; sourceTree = SOURCE_ROOT; }; - AAD2BF610C2C41A200AA0F11 /* DBListSplitViewDimple.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = DBListSplitViewDimple.tiff; path = Resources/DBListSplitViewDimple.tiff; sourceTree = SOURCE_ROOT; }; AAD794E4088A25D200E2CE5E /* PopUpButtonExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PopUpButtonExtensions.h; path = src/PopUpButtonExtensions.h; sourceTree = SOURCE_ROOT; }; AAD794E5088A25D200E2CE5E /* PopUpButtonExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PopUpButtonExtensions.m; path = src/PopUpButtonExtensions.m; sourceTree = SOURCE_ROOT; }; AAD7999D088B617900E2CE5E /* AddressBarCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = AddressBarCell.h; path = src/AddressBarCell.h; sourceTree = SOURCE_ROOT; }; @@ -1669,8 +1661,6 @@ 6624683A13C5F81F00C85417 /* sync.tiff */, B2B37ACD110A65DA0070EDA6 /* filter-icon.tiff */, 576668FF16DEB5A7001C8786 /* filter-icon@2x.tiff */, - AAD2BF600C2C41A200AA0F11 /* DBListSplitViewBar.tiff */, - AAD2BF610C2C41A200AA0F11 /* DBListSplitViewDimple.tiff */, AA13A08A0C36D34C00C64338 /* filterViewBackground.tiff */, AA18C4950C43F24900E11C0C /* browserBarBackground.tiff */, AA7F231510FA287700856924 /* blankButton.tiff */, @@ -1686,7 +1676,6 @@ B28DE7F50B754E590062F879 /* enclosure_header.tiff */, B28DE7F60B754E590062F879 /* enclosure.tiff */, AA71173609BEB70D00E3EA8A /* webpage.tiff */, - AA16C2B00C2D57D5006BBAC1 /* draggerImage.png */, AA71187B09BFE19D00E3EA8A /* lockedPage.tiff */, AAE3E42B09760DD2009E60D6 /* generalPrefImage.tiff */, AAE3E41B09760B42009E60D6 /* appearancePrefImage.tiff */, @@ -1706,7 +1695,6 @@ 5749799816E3D6A90021C8DE /* rssFolder@2x.tiff */, 5749799916E3D6A90021C8DE /* smartFolder@2x.tiff */, AA67F3980897377C008BBC37 /* stopRefresh.tiff */, - AA2185050861E7E10024DD4A /* metal_column_header.png */, AAB90EFC061D059D00CA4741 /* searchFolder.tiff */, AAFDB7AE0C0B1516000D1643 /* smartFolder.tiff */, AA26F435060490BD00FE7994 /* alphaPixel.tiff */, @@ -2266,7 +2254,6 @@ AA167A850658361B0091365D /* ViennaApp.scriptSuite in Resources */, AADD8963081C1916007C6E88 /* rssFolder.tiff in Resources */, AADD8A0E081C253F007C6E88 /* rssFeed.tiff in Resources */, - AA2185060861E7E10024DD4A /* metal_column_header.png in Resources */, AA3F7B4208711F6A00D2B96F /* comments_header.tiff in Resources */, AA20DC9E0882CCC300A226F5 /* unread.tiff in Resources */, AA6321510885F0BB006382D3 /* comments.tiff in Resources */, @@ -2303,10 +2290,7 @@ AA1A2A330C09D84E005968DC /* subscribeButtonPressed.tiff in Resources */, AA1A2C300C0A1EC1005968DC /* emptyTrashButton.tiff in Resources */, AAFDB7AF0C0B1516000D1643 /* smartFolder.tiff in Resources */, - AAD2BF620C2C41A200AA0F11 /* DBListSplitViewBar.tiff in Resources */, - AAD2BF630C2C41A200AA0F11 /* DBListSplitViewDimple.tiff in Resources */, F6A7DE4F1E471A7F0017BE5E /* Vienna.help in Resources */, - AA16C2B10C2D57D5006BBAC1 /* draggerImage.png in Resources */, AA16C5450C2DD4EB006BBAC1 /* refreshProgress.tiff in Resources */, AA13A08B0C36D34C00C64338 /* filterViewBackground.tiff in Resources */, B28C94780C3A896B008A09E5 /* mailLinkButton.tiff in Resources */,