Commit 800077cd authored by Meg Ford's avatar Meg Ford

mainWindow.js: Remove borders around scrolled window and row spacing in the groupGrid.

parent 593a4fbe
...@@ -163,7 +163,6 @@ const MainView = new Lang.Class({ ...@@ -163,7 +163,6 @@ const MainView = new Lang.Class({
groupGrid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL, groupGrid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
hexpand: true, hexpand: true,
vexpand: true, vexpand: true,
row_spacing: 12,
column_homogeneous: true }); column_homogeneous: true });
this.add_titled(groupGrid, name, "View"); this.add_titled(groupGrid, name, "View");
}, },
...@@ -171,6 +170,7 @@ const MainView = new Lang.Class({ ...@@ -171,6 +170,7 @@ const MainView = new Lang.Class({
onPlayStopClicked: function() { onPlayStopClicked: function() {
this.activeState = play.getPipeStates(); this.activeState = play.getPipeStates();
let listRow = this.listBox.get_selected_row(); let listRow = this.listBox.get_selected_row();
if (this.activeState == PipelineStates.PLAYING) { if (this.activeState == PipelineStates.PLAYING) {
play.stopPlaying(); play.stopPlaying();
let rowWidget = listRow.get_child(this.widget); let rowWidget = listRow.get_child(this.widget);
...@@ -180,9 +180,7 @@ const MainView = new Lang.Class({ ...@@ -180,9 +180,7 @@ const MainView = new Lang.Class({
if (child.name == "PauseToolbar") { if (child.name == "PauseToolbar") {
child.hide(); child.hide();
child.sensitive = false; child.sensitive = false;
} } else {
else {
child.show(); child.show();
child.sensitive = true; child.sensitive = true;
} }
...@@ -296,9 +294,6 @@ const MainView = new Lang.Class({ ...@@ -296,9 +294,6 @@ const MainView = new Lang.Class({
scrolledWinAdd: function() { scrolledWinAdd: function() {
this._scrolledWin = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN, this._scrolledWin = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN,
border_width: 12,
margin_bottom: 3,
margin_top: 5,
hexpand: true, hexpand: true,
vexpand: true }); vexpand: true });
this._scrolledWin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); this._scrolledWin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
...@@ -600,7 +595,9 @@ const MainView = new Lang.Class({ ...@@ -600,7 +595,9 @@ const MainView = new Lang.Class({
rowGridCallback: function(selectedRow) { rowGridCallback: function(selectedRow) {
this.destroyLoadMoreButton(); this.destroyLoadMoreButton();
if (selectedRow) { if (selectedRow) {
if (previousSelRow != null) { if (previousSelRow != null) {
this.hasPreviousSelRow(); this.hasPreviousSelRow();
} }
...@@ -677,6 +674,7 @@ const MainView = new Lang.Class({ ...@@ -677,6 +674,7 @@ const MainView = new Lang.Class({
onPause: function(listRow) { onPause: function(listRow) {
this.activeState = play.getPipeStates(); this.activeState = play.getPipeStates();
if (this.activeState == PipelineStates.PLAYING) { if (this.activeState == PipelineStates.PLAYING) {
play.pausePlaying(); play.pausePlaying();
let rowWidget = listRow.get_child(this.widget); let rowWidget = listRow.get_child(this.widget);
...@@ -736,7 +734,7 @@ const MainView = new Lang.Class({ ...@@ -736,7 +734,7 @@ const MainView = new Lang.Class({
child.sensitive = true; child.sensitive = true;
} }
})); }));
listRow.set_property("width-request", width); listRow.set_property("width-request", width);
if (this.activeState != PipelineStates.PAUSED) { if (this.activeState != PipelineStates.PAUSED) {
wave = new Waveform.WaveForm(this.wFGrid, selFile); wave = new Waveform.WaveForm(this.wFGrid, selFile);
...@@ -775,6 +773,7 @@ const RecordButton = new Lang.Class({ ...@@ -775,6 +773,7 @@ const RecordButton = new Lang.Class({
if (activeProfile == null) if (activeProfile == null)
activeProfile = 0; activeProfile = 0;
audioProfile.profile(activeProfile); audioProfile.profile(activeProfile);
view._record.startRecording(activeProfile); view._record.startRecording(activeProfile);
wave = new Waveform.WaveForm(view.recordGrid); wave = new Waveform.WaveForm(view.recordGrid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment