← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to shell/gnomecc.menu

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/gnomecc.menu
15
15
   <!-- Sort the control center categories -->
16
16
   <Layout>
17
17
     <Menuname>Personal</Menuname>
18
 
     <Menuname>Internet and Network</Menuname>
19
18
     <Menuname>Hardware</Menuname>
20
19
     <Menuname>System</Menuname>
 
20
     <Menuname>Other</Menuname>
21
21
     <Merge type="all" />
22
22
   </Layout>
23
23
 
29
29
        <Or>
30
30
          <Category>X-GNOME-PersonalSettings</Category>
31
31
          <Category>DesktopSettings</Category>
32
 
          <Category>X-GNOME-NetworkSettings</Category>
33
32
          <Category>HardwareSettings</Category>
34
33
          <Category>X-GNOME-SystemSettings</Category>
35
34
          <Category>System</Category>
40
39
 
41
40
  <!-- Avoid the shell having a launcher for itself -->
42
41
  <Exclude>
43
 
    <Filename>gnomecc.desktop</Filename>
 
42
    <Filename>gnome-control-center.desktop</Filename>
44
43
  </Exclude>
45
44
 
46
45
  <!-- Personal category -->
51
50
      <And>
52
51
        <Category>Settings</Category>
53
52
        <Category>X-GNOME-PersonalSettings</Category>
54
 
      </And>
55
 
      <And>
56
 
        <Category>Settings</Category>
57
 
        <Category>DesktopSettings</Category>
 
53
        <Category>X-GNOME-Settings-Panel</Category>
58
54
      </And>
59
55
    </Include>
60
56
  </Menu> <!-- End Personal -->
61
57
 
62
 
  <!-- Internet and Network category -->
63
 
  <Menu>
64
 
    <Name>Internet and Network</Name>
65
 
    <Directory>InternetAndNetwork.directory</Directory>
66
 
    <Include>
67
 
      <And>
68
 
        <Category>Settings</Category>
69
 
        <Category>X-GNOME-NetworkSettings</Category>
70
 
      </And>
71
 
    </Include>
72
 
  </Menu> <!-- End Internet and Network -->
73
 
  
74
58
  <!-- Hardware category -->
75
59
  <Menu>
76
60
    <Name>Hardware</Name>
79
63
      <And>
80
64
        <Category>Settings</Category>
81
65
        <Category>HardwareSettings</Category>
 
66
        <Category>X-GNOME-Settings-Panel</Category>
82
67
      </And>
83
68
    </Include>
84
69
  </Menu> <!-- End Hardware -->
90
75
    <Include>
91
76
      <And>
92
77
        <Category>Settings</Category>
93
 
        <Or>
94
 
          <Category>X-GNOME-SystemSettings</Category>
95
 
          <And>
96
 
            <Category>System</Category>
97
 
            <Not>
98
 
              <Or>
99
 
                <Category>X-GNOME-PersonalSettings</Category>
100
 
                <Category>DesktopSettings</Category>
101
 
                <Category>HardwareSettings</Category>
102
 
                <Category>X-GNOME-NetworkSettings</Category> 
103
 
              </Or>
104
 
            </Not>
105
 
          </And>
106
 
        </Or>
 
78
        <Category>X-GNOME-SystemSettings</Category>
 
79
        <Category>X-GNOME-Settings-Panel</Category>
107
80
      </And>
108
81
    </Include>
109
82
  </Menu> <!-- End System -->
110
83
 
 
84
  <!-- Other category -->
 
85
  <Menu>
 
86
    <Name>Other</Name>
 
87
    <Directory>X-GNOME-Other.directory</Directory>
 
88
    <Include>
 
89
      <And>
 
90
        <Category>Settings</Category>
 
91
        <Category>X-GNOME-Settings-Panel</Category>
 
92
        <Not>
 
93
          <Or>
 
94
            <Category>X-GNOME-PersonalSettings</Category>
 
95
            <Category>X-GNOME-SystemSettings</Category>
 
96
            <Category>HardwareSettings</Category>
 
97
            <Filename>gnome-control-center.desktop</Filename>
 
98
          </Or>
 
99
        </Not>
 
100
      </And>
 
101
    </Include>
 
102
  </Menu> <!-- End Other -->
 
103
 
111
104
</Menu>     <!-- End CC -->