Browse Source

Remove Unity support.

Change-Id: Ia427f2bcdd11a28d2822a8f3f199f1e020e79072
Reviewed-on: http://gerrit.dmdirc.com/2733
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.8
Greg Holmes 10 years ago
parent
commit
43969f10d1

+ 0
- 1
build.xml View File

111
             <zipfileset src="${plugins.lib}/jxlayer.jar" includes="org/jdesktop/jxlayer/**"/>
111
             <zipfileset src="${plugins.lib}/jxlayer.jar" includes="org/jdesktop/jxlayer/**"/>
112
             <zipfileset src="${plugins.lib}/cinch.jar" includes="*/**"/>
112
             <zipfileset src="${plugins.lib}/cinch.jar" includes="*/**"/>
113
             <zipfileset src="${plugins.lib}/cinchsupport.jar" includes="*/**"/>
113
             <zipfileset src="${plugins.lib}/cinchsupport.jar" includes="*/**"/>
114
-            <zipfileset src="${plugins.lib}/java-swing-ayatana-1.2.4.jar" includes="*/**"/>
115
         </jar>
114
         </jar>
116
 
115
 
117
         <jar destfile="${plugins.dist}/parser_twitter.jar" update="true">
116
         <jar destfile="${plugins.dist}/parser_twitter.jar" update="true">

+ 0
- 6
src/com/dmdirc/addons/ui_swing/MainFrame.java View File

68
 
68
 
69
 import net.miginfocom.swing.MigLayout;
69
 import net.miginfocom.swing.MigLayout;
70
 
70
 
71
-import org.java.ayatana.ApplicationMenu;
72
-import org.java.ayatana.AyatanaDesktop;
73
-
74
 /**
71
 /**
75
  * The main application frame.
72
  * The main application frame.
76
  */
73
  */
137
 
134
 
138
         focusOrder = new QueuedLinkedHashSet<>();
135
         focusOrder = new QueuedLinkedHashSet<>();
139
         initComponents();
136
         initComponents();
140
-        if (AyatanaDesktop.isSupported()) {
141
-            ApplicationMenu.tryInstall(this, getJMenuBar(), new UnityMenu());
142
-        }
143
 
137
 
144
         imageIcon = new ImageIcon(new IconManager(controller.getGlobalConfig())
138
         imageIcon = new ImageIcon(new IconManager(controller.getGlobalConfig())
145
                 .getImage("icon"));
139
                 .getImage("icon"));

+ 0
- 31
src/com/dmdirc/addons/ui_swing/UnityMenu.java View File

1
-/*
2
- * Copyright (c) 2006-2013 DMDirc Developers
3
- *
4
- * Permission is hereby granted, free of charge, to any person obtaining a copy
5
- * of this software and associated documentation files (the "Software"), to deal
6
- * in the Software without restriction, including without limitation the rights
7
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
- * copies of the Software, and to permit persons to whom the Software is
9
- * furnished to do so, subject to the following conditions:
10
- *
11
- * The above copyright notice and this permission notice shall be included in
12
- * all copies or substantial portions of the Software.
13
- *
14
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20
- * SOFTWARE.
21
- */
22
-package com.dmdirc.addons.ui_swing;
23
-
24
-import org.java.ayatana.DefaultExtraMenuAction;
25
-
26
-/**
27
- * Customisations to the Unity menu for DMDirc.
28
- */
29
-public class UnityMenu extends DefaultExtraMenuAction {
30
-
31
-}

Loading…
Cancel
Save