From 6e6bf28838eed66e61ff5ff13bc60c7ea6663120 Mon Sep 17 00:00:00 2001 From: ketmar Date: Wed, 27 Jul 2016 06:00:44 +0000 Subject: [PATCH] cosmetix FossilOrigin-Name: 1eb6926f00ec67494bcfc28f97fab6e978fc0f5ead29b4011624e9c72290652a --- xreader.d | 8 +++----- xreadercfg.d | 8 +++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xreader.d b/xreader.d index b33fea8..bb8e251 100644 --- a/xreader.d +++ b/xreader.d @@ -73,7 +73,7 @@ void run (string bookFileName) { setOpenGLContextVersion(2, 0); // it's enough //openGLContextCompatible = false; - auto sdwindow = new SimpleWindow(GWidth, GHeight, booktext.title~" -- "~booktext.authorFirst~" "~booktext.authorLast, OpenGlOptions.yes, Resizablity.allowResizing); + auto sdwindow = new SimpleWindow(GWidth, GHeight, booktext.title~" \xe2\x80\x94 "~booktext.authorFirst~" "~booktext.authorLast, OpenGlOptions.yes, Resizablity.allowResizing); sdwindow.hideCursor(); // we will do our own auto stt = MonoTime.currTime; @@ -312,7 +312,7 @@ void run (string bookFileName) { booktext = bt; bookmeta = meta; firstFormat = true; - sdwindow.title = booktext.title~" -- "~booktext.authorFirst~" "~booktext.authorLast; + sdwindow.title = booktext.title~" \xe2\x80\x94 "~booktext.authorFirst~" "~booktext.authorLast; flushGui(); } else if (bookmeta is null) { bookmeta = meta; @@ -520,7 +520,7 @@ void run (string bookFileName) { s ~= bi.seqname; s ~= ")"; } - if (bi.author.length) { s ~= " -- "; s ~= bi.author; } + if (bi.author.length) { s ~= " \xe2\x80\x94 "; s ~= bi.author; } res ~= s.to!dstring; } return res; @@ -981,8 +981,6 @@ void run (string bookFileName) { // ////////////////////////////////////////////////////////////////////////// // void main (string[] args) { import std.path; - RcDir = RcDir.expandTilde.absolutePath; - //writeln(RcDir); universe = Galaxy(0); diff --git a/xreadercfg.d b/xreadercfg.d index 60109e3..792900f 100644 --- a/xreadercfg.d +++ b/xreadercfg.d @@ -35,6 +35,12 @@ import booktext; __gshared string RcDir = "~/.xreader"; __gshared string stateFileName; +shared static this () { + import std.path; + RcDir = RcDir.expandTilde.absolutePath; + //writeln(RcDir); +} + __gshared float shipAngle = 0; __gshared bool showShip = false; @@ -87,7 +93,7 @@ BookInfo[] loadDetailedHistory () { try { res ~= loadBookInfo(line); res[$-1].diskfile = line.idup; - } catch (Exception e) {} + } catch (Exception) {} } } catch (Exception) {} return res; -- 2.11.4.GIT