[gnome-system-monitor] Removed system tab in favour of control center's Details pane. https://bugzilla.gnome.org/show_bug.c
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor] Removed system tab in favour of control center's Details pane. https://bugzilla.gnome.org/show_bug.c
- Date: Thu, 6 Dec 2012 19:49:00 +0000 (UTC)
commit f354bb932741be156d88c6d29d6986223526d616
Author: Robert Roth <robert roth off gmail com>
Date: Thu Dec 6 21:47:51 2012 +0200
Removed system tab in favour of control center's Details pane.
https://bugzilla.gnome.org/show_bug.cgi?id=649908
data/interface.ui | 46 +---
help/C/index.docbook | 102 +------
src/Makefile.am | 1 -
src/argv.cpp | 7 -
src/callbacks.cpp | 4 -
src/interface.cpp | 1 -
src/procdialogs.cpp | 1 -
src/procman-app.cpp | 7 +-
src/procman-app.h | 1 -
src/sysinfo.cpp | 849 --------------------------------------------------
src/sysinfo.h | 9 -
11 files changed, 12 insertions(+), 1016 deletions(-)
---
diff --git a/data/interface.ui b/data/interface.ui
index aad1a47..5288d0b 100644
--- a/data/interface.ui
+++ b/data/interface.ui
@@ -19,32 +19,6 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="sysinfo_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="border_width">12</property>
- <property name="spacing">12</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="sysinfo_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">System</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="proc_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -56,7 +30,7 @@
<child>
<object class="GtkBox" id="proc_top_box">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="load_avg_label">
<property name="visible">True</property>
@@ -73,6 +47,8 @@
<object class="GtkButton" id="refreshbutton">
<property name="label">Refresh</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -149,14 +125,12 @@
<child>
<object class="GtkButton" id="endprocessbutton">
<property name="label" translatable="yes">End _Process</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <accelerator key="Delete" signal="clicked" />
+ <accelerator key="Delete" signal="clicked"/>
</object>
<packing>
<property name="expand">False</property>
@@ -165,9 +139,6 @@
</packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="proc_label">
@@ -176,7 +147,6 @@
<property name="label" translatable="yes">Processes</property>
</object>
<packing>
- <property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -561,7 +531,7 @@
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child type="tab">
@@ -571,7 +541,7 @@
<property name="label" translatable="yes">Resources</property>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -601,7 +571,7 @@
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child type="tab">
@@ -611,7 +581,7 @@
<property name="label" translatable="yes">File Systems</property>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
diff --git a/help/C/index.docbook b/help/C/index.docbook
index 2dd4a29..067ee86 100644
--- a/help/C/index.docbook
+++ b/help/C/index.docbook
@@ -169,69 +169,14 @@
<sect1 id="gnome-system-monitor-intro">
<title>Introduction</title>
<para>
- The <application>&app;</application> application enables you to display basic system information and monitor system processes, usage of system resources, and file systems. You can also use <application>&app;</application> to modify the behavior of your system.
+ The <application>&app;</application> application enables you to monitor system processes, usage of system resources, and file systems. You can also use <application>&app;</application> to modify the behavior of your system.
</para>
<para>
- The <application>&app;</application> window contains four tabbed sections:
+ The <application>&app;</application> window contains three tabbed sections:
</para>
<variablelist>
<varlistentry>
<term>
- <guilabel>System</guilabel>
- </term>
- <listitem>
- <para>Displays various basic information about the computer's hardware and software.</para>
- <variablelist>
- <varlistentry>
- <term>
- Distribution
- </term>
- <listitem>
- <itemizedlist>
- <listitem>
- <para>Distribution version</para>
- </listitem>
- <listitem>
- <para>Linux Kernel version</para>
- </listitem>
- <listitem>
- <para>GNOME version</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- Hardware
- </term>
- <listitem>
- <itemizedlist>
- <listitem>
- <para>Installed memory</para>
- </listitem>
- <listitem>
- <para>Processors and speeds</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- System Status
- </term>
- <listitem>
- <itemizedlist>
- <listitem>
- <para>Currently available disk space</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
<guilabel>Processes</guilabel>
</term>
<listitem>
@@ -345,14 +290,6 @@
<itemizedlist>
<listitem>
<para>
- <guilabel>System</guilabel>
- </para>
- <para>
- Contains a list of basic system properties, such as system software versions and hardware specifications and status.
- </para>
- </listitem>
- <listitem>
- <para>
<guilabel>Processes</guilabel>
</para>
<para>
@@ -378,14 +315,6 @@
</itemizedlist>
</listitem>
</varlistentry>
- <varlistentry>
- <term>Statusbar</term>
- <listitem>
- <para>
- The statusbar displays information about current <application>&app;</application> activity and contextual information about the menu items.
- </para>
- </listitem>
- </varlistentry>
</variablelist>
</sect2>
</sect1>
@@ -397,33 +326,6 @@
<sect1 id="gnome-system-monitor-usage">
<title>Usage</title>
- <sect2 id="gnome-system-monitor-display-basic-info">
- <title>To Display Basic System Information</title>
- <para>
- To display basic system information, select the <guilabel>System</guilabel> tab.
- </para>
- <para>
- In the <guilabel>System</guilabel> tab, information is organized into three groups:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- System Information
- </para>
- </listitem>
- <listitem>
- <para>
- Hardware
- </para>
- </listitem>
- <listitem>
- <para>
- System Status
- </para>
- </listitem>
- </itemizedlist>
- </sect2>
-
<sect2 id="gnome-system-monitor-display-processlist">
<title>To Display the Process List</title>
<para>
diff --git a/src/Makefile.am b/src/Makefile.am
index 277ecbd..eb6f665 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,6 @@ gnome_system_monitor_cpp_files = \
procman_gnomesu.cpp \
procman_gksu.cpp \
procman_pkexec.cpp \
- sysinfo.cpp \
lsof.cpp \
selection.cpp \
settings-keys.cpp \
diff --git a/src/argv.cpp b/src/argv.cpp
index 42e8d70..5f07268 100644
--- a/src/argv.cpp
+++ b/src/argv.cpp
@@ -10,16 +10,10 @@ namespace procman
{
OptionGroup::OptionGroup()
: Glib::OptionGroup("", ""),
- show_system_tab(false),
show_processes_tab(false),
show_resources_tab(false),
show_file_systems_tab(false)
{
- Glib::OptionEntry sys_tab;
- sys_tab.set_long_name("show-system-tab");
- sys_tab.set_short_name('s');
- sys_tab.set_description(_("Show the System tab"));
-
Glib::OptionEntry proc_tab;
proc_tab.set_long_name("show-processes-tab");
proc_tab.set_short_name('p');
@@ -35,7 +29,6 @@ namespace procman
fs_tab.set_short_name('f');
fs_tab.set_description(_("Show the File Systems tab"));
- this->add_entry(sys_tab, this->show_system_tab);
this->add_entry(proc_tab, this->show_processes_tab);
this->add_entry(res_tab, this->show_resources_tab);
this->add_entry(fs_tab, this->show_file_systems_tab);
diff --git a/src/callbacks.cpp b/src/callbacks.cpp
index 3118521..095270e 100644
--- a/src/callbacks.cpp
+++ b/src/callbacks.cpp
@@ -38,7 +38,6 @@
#include "load-graph.h"
#include "disks.h"
#include "lsof.h"
-#include "sysinfo.h"
void
cb_kill_sigstop(GtkAction *action, gpointer data)
@@ -441,9 +440,6 @@ cb_change_current_page (GtkNotebook *nb, gint num, gpointer data)
}
}
- if (num == PROCMAN_TAB_SYSINFO) {
- procman::build_sysinfo_ui();
- }
}
diff --git a/src/interface.cpp b/src/interface.cpp
index 5d45c53..8d9d352 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -37,7 +37,6 @@
#include "load-graph.h"
#include "util.h"
#include "disks.h"
-#include "sysinfo.h"
#include "gsm_color_button.h"
static void cb_toggle_tree (GtkAction *action, gpointer data);
diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp
index df4869f..fd0f205 100644
--- a/src/procdialogs.cpp
+++ b/src/procdialogs.cpp
@@ -564,7 +564,6 @@ procdialog_create_preferences_dialog (ProcmanApp *app)
G_CALLBACK (prefs_dialog_button_pressed), app);
switch (app->config.current_tab) {
- case PROCMAN_TAB_SYSINFO:
case PROCMAN_TAB_PROCESSES:
gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
break;
diff --git a/src/procman-app.cpp b/src/procman-app.cpp
index 0b7a1c3..787f879 100644
--- a/src/procman-app.cpp
+++ b/src/procman-app.cpp
@@ -350,7 +350,7 @@ ProcmanApp::load_settings()
config.disks_update_interval = MAX (config.disks_update_interval, 1000);
config.whose_process = CLAMP (config.whose_process, 0, 2);
config.current_tab = CLAMP(config.current_tab,
- PROCMAN_TAB_SYSINFO,
+ PROCMAN_TAB_PROCESSES,
PROCMAN_TAB_DISKS);
}
@@ -553,10 +553,7 @@ int ProcmanApp::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>&
g_error("Arguments parse error : %s", ex.what().c_str());
}
- if (option_group.show_system_tab) {
- procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request");
- set_tab(GTK_NOTEBOOK(notebook), PROCMAN_TAB_SYSINFO, this);
- } else if (option_group.show_processes_tab) {
+ if (option_group.show_processes_tab) {
procman_debug("Starting with PROCMAN_TAB_PROCESSES by commandline request");
set_tab(GTK_NOTEBOOK(notebook), PROCMAN_TAB_PROCESSES, this);
} else if (option_group.show_resources_tab) {
diff --git a/src/procman-app.h b/src/procman-app.h
index 3294944..d698649 100644
--- a/src/procman-app.h
+++ b/src/procman-app.h
@@ -35,7 +35,6 @@ static const unsigned MAX_UPDATE_INTERVAL = 100 * 1000;
enum ProcmanTab
{
- PROCMAN_TAB_SYSINFO,
PROCMAN_TAB_PROCESSES,
PROCMAN_TAB_RESOURCES,
PROCMAN_TAB_DISKS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
