remove unused panels selection from menu
History and Contact panels will not be used anymore with the ongoing
refactoring. As we will have a single list, we remove the selection
menu.
Change-Id: Iaa96c3feb51c1765570369f2cd6d18be04a2ef99
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index f6ceca2..05003a9 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -283,21 +283,6 @@
[preferencesWC.window makeKeyAndOrderFront:preferencesWC.window];
}
-- (IBAction)showHistory:(NSButton*)sender
-{
- [smartViewVC showHistory];
-}
-
-- (IBAction)showContacts:(NSButton*)sender
-{
- [smartViewVC showContacts];
-}
-
-- (IBAction)showSmartlist:(NSButton*)sender
-{
- [smartViewVC showSmartlist];
-}
-
- (IBAction)callClickedAtRow:(id)sender
{
NSTabViewItem *selectedTab = [smartViewVC.tabbar selectedTabViewItem];
diff --git a/src/SmartViewVC.h b/src/SmartViewVC.h
index c7a4ddd..0fd05f0 100644
--- a/src/SmartViewVC.h
+++ b/src/SmartViewVC.h
@@ -23,12 +23,6 @@
@property (unsafe_unretained) IBOutlet NSTabView* tabbar;
-- (void)showHistory;
-
-- (void)showContacts;
-
-- (void)showSmartlist;
-
- (void)startCallForRow:(id)sender;
@end
diff --git a/src/SmartViewVC.mm b/src/SmartViewVC.mm
index 494028e..cf7608e 100644
--- a/src/SmartViewVC.mm
+++ b/src/SmartViewVC.mm
@@ -193,21 +193,6 @@
}
}
-- (void)showHistory
-{
- [tabbar selectTabViewItemAtIndex:1];
-}
-
-- (void)showContacts
-{
- [tabbar selectTabViewItemAtIndex:2];
-}
-
-- (void)showSmartlist
-{
- [tabbar selectTabViewItemAtIndex:0];
-}
-
#pragma mark - NSOutlineViewDelegate methods
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item;
diff --git a/ui/Base.lproj/MainMenu.xib b/ui/Base.lproj/MainMenu.xib
index 3ef456c..7e04eec 100644
--- a/ui/Base.lproj/MainMenu.xib
+++ b/ui/Base.lproj/MainMenu.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="RingWindowController">
@@ -279,30 +279,6 @@
</items>
</menu>
</menuItem>
- <menuItem title="Show" id="12w-Fz-Scs">
- <menu key="submenu" title="Show" id="1fJ-em-1ww">
- <items>
- <menuItem title="Show contacts" id="GU3-tt-2de">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="showContacts:" target="-1" id="A5d-DJ-xdI"/>
- </connections>
- </menuItem>
- <menuItem title="Show call history" id="Oco-m7-LtS">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="showHistory:" target="-1" id="3Kd-iy-6b9"/>
- </connections>
- </menuItem>
- <menuItem title="Show recent" id="GTY-d8-NBf">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="showSmartlist:" target="-1" id="7GT-ZF-CmM"/>
- </connections>
- </menuItem>
- </items>
- </menu>
- </menuItem>
<menuItem title="View" id="295">
<menu key="submenu" title="View" id="296">
<items>