From a7576cf1413d1104b4cb54bc7889c17fdd552e18 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Sat, 3 Aug 2013 14:09:51 +0100
Subject: [PATCH] [Add] <resedit> Scroll bars added where needed.
---
utils/resedit/planets.glade | 83 ++++++++++++++++++++++-----------
utils/resedit/space.glade | 91 ++++++++++++++++++++++++-------------
2 files changed, 116 insertions(+), 58 deletions(-)
diff --git a/utils/resedit/planets.glade b/utils/resedit/planets.glade
index ec44153..9a01302 100644
--- a/utils/resedit/planets.glade
+++ b/utils/resedit/planets.glade
@@ -12,12 +12,20 @@
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkTreeView" id="trePlanets">
- <property name="width_request">150</property>
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTreeView" id="trePlanets">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="resize">False</property>
@@ -106,20 +114,6 @@
<property name="y">173</property>
</packing>
</child>
- <child>
- <widget class="GtkTreeView" id="treCommodities">
- <property name="width_request">188</property>
- <property name="height_request">149</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="x">17</property>
- <property name="y">196</property>
- </packing>
- </child>
<child>
<widget class="GtkComboBox" id="comCommodities">
<property name="width_request">189</property>
@@ -559,6 +553,30 @@
<property name="y">150</property>
</packing>
</child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="width_request">190</property>
+ <property name="height_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTreeView" id="treCommodities">
+ <property name="width_request">188</property>
+ <property name="height_request">149</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="x">15</property>
+ <property name="y">195</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="resize">True</property>
@@ -579,17 +597,30 @@
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkTextView" id="texDescription">
- <property name="width_request">400</property>
- <property name="height_request">400</property>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTextView" id="texDescription">
+ <property name="width_request">400</property>
+ <property name="height_request">400</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
- <packing>
- <property name="padding">10</property>
- </packing>
</child>
<child>
<widget class="GtkButton" id="butDescDone">
diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade
index e1fc82d..2762c8c 100644
--- a/utils/resedit/space.glade
+++ b/utils/resedit/space.glade
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Jun 9 18:52:13 2008 -->
<glade-interface>
<widget class="GtkWindow" id="winSystems">
<property name="width_request">750</property>
@@ -18,12 +17,20 @@
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkTreeView" id="treSystems">
- <property name="width_request">200</property>
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTreeView" id="treSystems">
+ <property name="width_request">200</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="resize">False</property>
@@ -203,20 +210,6 @@
<property name="y">219</property>
</packing>
</child>
- <child>
- <widget class="GtkTreeView" id="treJumps">
- <property name="width_request">193</property>
- <property name="height_request">182</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="x">10</property>
- <property name="y">238</property>
- </packing>
- </child>
<child>
<widget class="GtkButton" id="butRmJump">
<property name="width_request">70</property>
@@ -371,19 +364,6 @@
<property name="y">420</property>
</packing>
</child>
- <child>
- <widget class="GtkTreeView" id="treFleets">
- <property name="width_request">250</property>
- <property name="height_request">161</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="x">10</property>
- <property name="y">471</property>
- </packing>
- </child>
<child>
<widget class="GtkButton" id="butFleetAdd">
<property name="width_request">70</property>
@@ -552,6 +532,53 @@
<property name="y">201</property>
</packing>
</child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="width_request">250</property>
+ <property name="height_request">160</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTreeView" id="treFleets">
+ <property name="width_request">250</property>
+ <property name="height_request">161</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="x">10</property>
+ <property name="y">470</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="width_request">190</property>
+ <property name="height_request">180</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTreeView" id="treJumps">
+ <property name="width_request">193</property>
+ <property name="height_request">182</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="x">10</property>
+ <property name="y">238</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="resize">True</property>