Fix sidesplash scaling issues
This commit is contained in:
parent
ba4d10dd6b
commit
ad840bee77
|
@ -48,7 +48,6 @@ namespace SparkleShare {
|
||||||
private NSButtonCell ButtonCellProto;
|
private NSButtonCell ButtonCellProto;
|
||||||
private NSMatrix Matrix;
|
private NSMatrix Matrix;
|
||||||
private int ServerType;
|
private int ServerType;
|
||||||
|
|
||||||
private bool ServerFormOnly;
|
private bool ServerFormOnly;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,15 @@
|
||||||
// You should have received a copy of the GNU General private License
|
// You should have received a copy of the GNU General private License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
using Gtk;
|
|
||||||
using Mono.Unix;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Timers;
|
||||||
|
|
||||||
|
using Gtk;
|
||||||
|
using Mono.Unix;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
|
@ -287,7 +290,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
FolderEntry.Changed += CheckServerForm;
|
FolderEntry.Changed += CheckServerForm;
|
||||||
|
|
||||||
Label folder_label = new Label ("<b>" + _("Folder Name:") + "</b>") {
|
Label folder_label = new Label (_("Folder Name:")) {
|
||||||
UseMarkup = true,
|
UseMarkup = true,
|
||||||
Xalign = 1
|
Xalign = 1
|
||||||
};
|
};
|
||||||
|
@ -611,17 +614,13 @@ namespace SparkleShare {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// private ProgressBar ProgressBar;
|
|
||||||
// The page shown whilst syncing
|
// The page shown whilst syncing
|
||||||
private void ShowSyncingPage (string name)
|
private void ShowSyncingPage (string name)
|
||||||
{
|
{
|
||||||
|
|
||||||
Reset ();
|
Reset ();
|
||||||
|
|
||||||
// ProgressBar = new ProgressBar () {
|
|
||||||
// Fraction = 0
|
|
||||||
// };
|
|
||||||
|
|
||||||
VBox layout_vertical = new VBox (false, 0);
|
VBox layout_vertical = new VBox (false, 0);
|
||||||
|
|
||||||
Label header = new Label ("<span size='x-large'><b>" +
|
Label header = new Label ("<span size='x-large'><b>" +
|
||||||
|
@ -662,11 +661,25 @@ namespace SparkleShare {
|
||||||
table.Attach (spinner, 0, 1, 0, 1);
|
table.Attach (spinner, 0, 1, 0, 1);
|
||||||
table.Attach (header, 1, 2, 0, 1);
|
table.Attach (header, 1, 2, 0, 1);
|
||||||
table.Attach (information, 1, 2, 1, 2);
|
table.Attach (information, 1, 2, 1, 2);
|
||||||
//table.Attach (ProgressBar, 2, 3, 0, 2);
|
|
||||||
|
|
||||||
box.PackStart (table, false, false, 0);
|
box.PackStart (table, false, false, 0);
|
||||||
|
|
||||||
|
ProgressBar progress_bar = new ProgressBar () {
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
Timer timer = new Timer () {
|
||||||
|
Interval = 100
|
||||||
|
};
|
||||||
|
|
||||||
|
timer.Elapsed += delegate {
|
||||||
|
progress_bar.Pulse ();
|
||||||
|
};
|
||||||
|
|
||||||
layout_vertical.PackStart (box, false, false, 0);
|
layout_vertical.PackStart (box, false, false, 0);
|
||||||
|
layout_vertical.PackStart (progress_bar, true, false, 0);
|
||||||
|
|
||||||
|
timer.Start ();
|
||||||
|
|
||||||
Add (layout_vertical);
|
Add (layout_vertical);
|
||||||
|
|
||||||
|
|
|
@ -42,27 +42,36 @@ namespace SparkleShare {
|
||||||
Resizable = true;
|
Resizable = true;
|
||||||
WindowPosition = WindowPosition.Center;
|
WindowPosition = WindowPosition.Center;
|
||||||
|
|
||||||
SetDefaultSize (640, 480);
|
SetDefaultSize (640, 425);
|
||||||
|
|
||||||
Buttons = CreateButtonBox ();
|
|
||||||
|
|
||||||
HBox = new HBox (false, 6);
|
HBox = new HBox (false, 6);
|
||||||
|
|
||||||
string image_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare",
|
|
||||||
"pixmaps", "side-splash.png");
|
|
||||||
|
|
||||||
Image side_splash = new Image (image_path);
|
|
||||||
|
|
||||||
VBox = new VBox (false, 0);
|
VBox = new VBox (false, 0);
|
||||||
|
|
||||||
Wrapper = new VBox (false, 0) {
|
Wrapper = new VBox (false, 0) {
|
||||||
BorderWidth = 30
|
BorderWidth = 30
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Buttons = CreateButtonBox ();
|
||||||
|
|
||||||
VBox.PackStart (Wrapper, true, true, 0);
|
VBox.PackStart (Wrapper, true, true, 0);
|
||||||
VBox.PackStart (Buttons, false, false, 0);
|
VBox.PackStart (Buttons, false, false, 0);
|
||||||
|
|
||||||
HBox.PackStart (side_splash, false, false, 0);
|
EventBox box = new EventBox ();
|
||||||
|
Gdk.Color bg_color = new Gdk.Color ();
|
||||||
|
Gdk.Color.Parse ("#2e3336", ref bg_color);
|
||||||
|
box.ModifyBg (StateType.Normal, bg_color);
|
||||||
|
|
||||||
|
string image_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare",
|
||||||
|
"pixmaps", "side-splash.png");
|
||||||
|
|
||||||
|
Image side_splash = new Image (image_path) {
|
||||||
|
Yalign = 1
|
||||||
|
};
|
||||||
|
|
||||||
|
box.Add (side_splash);
|
||||||
|
|
||||||
|
HBox.PackStart (box, true, true, 0);
|
||||||
HBox.PackStart (VBox, true, true, 0);
|
HBox.PackStart (VBox, true, true, 0);
|
||||||
|
|
||||||
base.Add (HBox);
|
base.Add (HBox);
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
Loading…
Reference in a new issue