[gst-debugger] gst-debugger: remove unnecesary code
- From: Marcin Kolny <mkolny src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gst-debugger] gst-debugger: remove unnecesary code
- Date: Tue, 1 Sep 2015 20:50:22 +0000 (UTC)
commit 4e15e97b63e5e59f38754a970bf8253d8abc8d82
Author: Marcin Kolny <marcin kolny gmail com>
Date: Tue Sep 1 22:49:41 2015 +0200
gst-debugger: remove unnecesary code
src/gst-debugger/Makefile.am | 2 -
src/gst-debugger/modules/gst_log_module.cpp | 141 --------
src/gst-debugger/modules/gst_log_module.h | 64 ----
src/gst-debugger/modules/gst_message_module.cpp | 110 ------
src/gst-debugger/modules/gst_message_module.h | 47 ---
src/gst-debugger/modules/gst_qe_module.cpp | 329 ------------------
src/gst-debugger/modules/gst_qe_module.h | 100 ------
src/gst-debugger/modules/main_module.cpp | 20 +-
src/gst-debugger/modules/main_module.h | 9 -
src/gst-debugger/ui/gst-debugger.glade | 422 ++---------------------
10 files changed, 38 insertions(+), 1206 deletions(-)
---
diff --git a/src/gst-debugger/Makefile.am b/src/gst-debugger/Makefile.am
index 3276dc5..ab27b6e 100644
--- a/src/gst-debugger/Makefile.am
+++ b/src/gst-debugger/Makefile.am
@@ -45,7 +45,6 @@ gst_debugger_headers = \
modules/base_main_module.h \
modules/bus_messages_module.h \
modules/control_module.h \
- modules/gst_log_module.h \
modules/gst_properties_module.h \
modules/log_module.h \
modules/main_module.h \
@@ -81,7 +80,6 @@ gst_debugger_ GST_API_VERSION@_SOURCES = \
models/gst_pipeline_model.cpp \
modules/base_main_module.cpp \
modules/bus_messages_module.cpp \
- modules/gst_log_module.cpp \
modules/gst_properties_module.cpp \
modules/log_module.cpp \
modules/main_module.cpp \
diff --git a/src/gst-debugger/modules/main_module.cpp b/src/gst-debugger/modules/main_module.cpp
index 90a85b1..8d8199f 100644
--- a/src/gst-debugger/modules/main_module.cpp
+++ b/src/gst-debugger/modules/main_module.cpp
@@ -24,20 +24,8 @@ MainModule::MainModule(const Glib::RefPtr<Gtk::Builder> &builder)
details_tree_view->signal_row_activated().connect(sigc::mem_fun(*this,
&MainModule::mainDetailsTreeView_row_activated_cb));
BaseMainModule::configure_details_view(details_tree_view);
- builder->get_widget("existingHooksTreeView", existing_hooks_tree_view);
- builder->get_widget("hookPadPathLabel", pad_path_label);
-
- builder->get_widget("addNewHookButton", add_hook_button);
- builder->get_widget("removeSelectedHook", remove_selected_hook_button);
-
- builder->get_widget("hookTypesComboBox", types_combobox);
- builder->get_widget("hookTypeBox", hook_type_box);
- builder->get_widget("hookAnyPathCheckButton", any_path_check_button);
- builder->get_widget("hookAnyTypeCheckButton", any_type_check_button);
builder->get_widget("controllerFrame", controller_frame);
- create_dispatcher("selected-object", sigc::mem_fun(*this, &MainModule::selected_object_changed),
nullptr);
-
load_submodules(builder);
}
@@ -68,6 +56,8 @@ void MainModule::load_submodules(const Glib::RefPtr<Gtk::Builder>& builder)
}
});
}
+
+ update_module(submodules["logMessages"]);
}
void MainModule::set_controller(const std::shared_ptr<Controller> &controller)
@@ -83,12 +73,6 @@ void MainModule::set_controller(const std::shared_ptr<Controller> &controller)
}
}
-void MainModule::selected_object_changed()
-{
- std::shared_ptr<PadModel> selected_pad =
std::dynamic_pointer_cast<PadModel>(controller->get_selected_object());
- pad_path_label->set_text(selected_pad ? ElementPathProcessor::get_object_path(selected_pad) :
"(none)");
-}
-
void MainModule::update_module(const MainModuleInfo &module_info)
{
module_info.display_module->configure_main_list_view(list_tree_view);
diff --git a/src/gst-debugger/modules/main_module.h b/src/gst-debugger/modules/main_module.h
index 41e2c57..eb70c79 100644
--- a/src/gst-debugger/modules/main_module.h
+++ b/src/gst-debugger/modules/main_module.h
@@ -26,14 +26,6 @@ class MainModule : public IBaseView
Gtk::TreeView *list_tree_view;
Gtk::TreeView *details_tree_view;
- Gtk::Button *add_hook_button;
- Gtk::Button *remove_selected_hook_button;
- Gtk::ComboBox *types_combobox;
- Gtk::CheckButton *any_path_check_button;
- Gtk::CheckButton *any_type_check_button;
- Gtk::TreeView *existing_hooks_tree_view;
- Gtk::Label *pad_path_label;
- Gtk::Box *hook_type_box;
Gtk::Frame *controller_frame;
TypesModelColumns types_columns;
@@ -42,7 +34,6 @@ class MainModule : public IBaseView
std::map<std::string, MainModuleInfo> submodules;
- void selected_object_changed();
void load_submodules(const Glib::RefPtr<Gtk::Builder>& builder);
void update_module(const MainModuleInfo &module_info);
diff --git a/src/gst-debugger/ui/gst-debugger.glade b/src/gst-debugger/ui/gst-debugger.glade
index d639493..f121e4f 100644
--- a/src/gst-debugger/ui/gst-debugger.glade
+++ b/src/gst-debugger/ui/gst-debugger.glade
@@ -214,437 +214,87 @@
<property name="can_focus">True</property>
<property name="position">645</property>
<child>
- <object class="GtkNotebook" id="notebook1">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkPaned" id="paned7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="orientation">vertical</property>
+ <property name="position">88</property>
+ <property name="position_set">True</property>
<child>
- <object class="GtkPaned" id="paned7">
+ <object class="GtkScrolledWindow" id="scrolledwindow14">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="orientation">vertical</property>
- <property name="position">88</property>
- <property name="position_set">True</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow14">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="mainListTreeView">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection20"/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow15">
+ <object class="GtkTreeView" id="mainListTreeView">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="mainDetailsTreeView">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_top">1</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection21"/>
- </child>
- </object>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection"/>
</child>
</object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="controllerFrame">
+ <object class="GtkScrolledWindow" id="scrolledwindow15">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkBox" id="box22">
+ <object class="GtkTreeView" id="mainDetailsTreeView">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="hookTypeBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Event type:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="hookAnyTypeCheckButton">
- <property name="label" translatable="yes">any event</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="hookTypesComboBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box24">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Path:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="hookAnyPathCheckButton">
- <property name="label" translatable="yes">any path</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="hookPadPathLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">(none)</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="addNewHookButton">
- <property name="label" translatable="yes">Add hook</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Existing hooks:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow16">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="existingHooksTreeView">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection2"/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="removeSelectedHook">
- <property name="label" translatable="yes">Remove selected</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">7</property>
- </packing>
+ <property name="can_focus">True</property>
+ <property name="margin_top">1</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Controller</property>
- </object>
- </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
</packing>
</child>
</object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page 1</property>
- </object>
<packing>
- <property name="tab_fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkFrame" id="controllerFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="logMessagesTreeView">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection"/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
+ <placeholder/>
</child>
- <child>
- <object class="GtkBox" id="box3">
+ <child type="label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="watchLogCheckButton">
- <property name="label" translatable="yes">Watch log messages</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0.5</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Debug categories:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="debugCategoriesComboBoxText">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Log threshold:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="logThresholdEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="width_chars">5</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="overwriteCurrentThresholdCheckButton">
- <property name="label" translatable="yes">Overwrite current threshold</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0.5</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="setThresholdButton">
- <property name="label" translatable="yes">Set threshold</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="clearMessageLogsButton">
- <property name="label" translatable="yes">Clear logs</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="saveMessageLogsButton">
- <property name="label" translatable="yes">Save logs to file</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">8</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Controller</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child type="tab">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Log messages</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
</object>
<packing>
<property name="resize">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
