diff options
| author | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-11-14 17:51:54 +0300 |
|---|---|---|
| committer | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-11-14 17:51:54 +0300 |
| commit | d0206dab5cf2e437a9dfb5fcf2f7ae9dd2eecb4a (patch) | |
| tree | f2f71d0952875e59a8833ef471679fe7f2c3c9c5 /data | |
| parent | 0fccba917afae505c87e1331147af0ba90d43dc5 (diff) | |
| parent | 436209db8998a8c44232061078d0e19a80cf6879 (diff) | |
Merge branch 'ref/news-cleaning' into 'master'
Removing the News Widget
See merge request Remmina/Remmina!2446
Diffstat (limited to 'data')
| -rw-r--r-- | data/ui/remmina_main.glade | 10 | ||||
| -rw-r--r-- | data/ui/remmina_preferences.glade | 57 |
2 files changed, 5 insertions, 62 deletions
diff --git a/data/ui/remmina_main.glade b/data/ui/remmina_main.glade index c0f90f89f..609cd80eb 100644 --- a/data/ui/remmina_main.glade +++ b/data/ui/remmina_main.glade @@ -330,16 +330,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </object> </child> <child> - <object class="GtkMenuItem" id="menuitem_help_news"> - <property name="visible">True</property> - <property name="app-paintable">True</property> - <property name="can-focus">False</property> - <property name="action-name">app.news</property> - <property name="label" translatable="yes">News</property> - <property name="use-underline">True</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="menuitem_help_homepage"> <property name="visible">True</property> <property name="app-paintable">True</property> diff --git a/data/ui/remmina_preferences.glade b/data/ui/remmina_preferences.glade index 6be3f20ab..71fe2ef60 100644 --- a/data/ui/remmina_preferences.glade +++ b/data/ui/remmina_preferences.glade @@ -389,7 +389,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">12</property> + <property name="top-attach">11</property> </packing> </child> <child> @@ -402,58 +402,11 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">12</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="switch_permit_news"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="margin-end">18</property> - </object> - <packing> - <property name="left-attach">1</property> <property name="top-attach">11</property> <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel" id="privacy_disclaimer_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="margin-start">18</property> - <property name="margin-end">18</property> - <property name="label" translatable="yes">* By enabling news you consent to fetch data from remmina.org</property> - <property name="justify">fill</property> - <property name="wrap">True</property> - <property name="wrap-mode">word-char</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">14</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="rmnews_allow_news_label"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="halign">start</property> - <property name="margin-start">18</property> - <property name="margin-end">6</property> - <property name="label" translatable="yes" comments="The star (*) is a reference to privacy consent">Fetch news from <a href="https://remmina.org" title="Remmina news site">remmina.org</a> (*)</property> - <property name="use-markup">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">11</property> - </packing> - </child> - <child> <object class="GtkEntry" id="entry_options_recent_items"> <property name="visible">True</property> <property name="can-focus">True</property> @@ -497,7 +450,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">13</property> + <property name="top-attach">12</property> </packing> </child> <child> @@ -511,7 +464,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">13</property> + <property name="top-attach">12</property> <property name="width">2</property> </packing> </child> @@ -2378,7 +2331,7 @@ Except the "Weak" method, all the others are recommended, "Keystore" is the defa </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">12</property> + <property name="top-attach">11</property> </packing> </child> <child> @@ -2393,7 +2346,7 @@ Except the "Weak" method, all the others are recommended, "Keystore" is the defa </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">12</property> + <property name="top-attach">11</property> <property name="width">8</property> </packing> </child> |