';
$("#sort").append(html);
});
drag();
@@ -104,18 +104,14 @@ function sort(){
Materialize.toast("並べ替え完了。", 3000);
sortload();
parseColumn();
- sortToggle()
+ sortMenu()
}
//ソートボタントグル
-function sortToggle(){
+function sortMenu(){
+ $("#left-menu div").removeClass("active");
+ $("#sortMenu").addClass("active");
+ $(".menu-content").addClass("hide");
+ $("#sort-box").removeClass("hide");
$("#sort").html("");
- if ($("#sort-box").hasClass("hide")) {
- $("#sort-box").removeClass("hide");
- $("#sort-box").addClass("show");
- //並べ替え
- sortload();
- } else {
- $("#sort-box").addClass("hide");
- $("#sort-box").removeClass("show");
- }
+ sortload();
}
\ No newline at end of file
diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js
index a464d32d..4b8728d8 100644
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -130,7 +130,11 @@ function udg(user, acct_id) {
$('#his-data').css('background-image', 'url(' + json.header + ')');
$("#his-sta").text(json.statuses_count);
$("#his-follow").text(json.following_count);
- $("#his-follower").text(json.followers_count);
+ var flerc=json.followers_count;
+ if(flerc<0){
+ flerc="-";
+ }
+ $("#his-follower").text(flerc);
$("#his-since").text(crat(json.created_at));
$("#his-openin").attr("data-href", json.url);
if(json.fields){
diff --git a/app/main.js b/app/main.js
index d57b72e4..38ab0479 100644
--- a/app/main.js
+++ b/app/main.js
@@ -27,8 +27,15 @@ var info_path = join(app.getPath("userData"), "window-size.json");
var max_info_path = join(app.getPath("userData"), "max-window-size.json");
var lang_path=join(app.getPath("userData"), "language");
var customcss=join(app.getPath("userData"), "custom.css");
-
var tmp_img = join(app.getPath("userData"), "tmp.png");
+var ha_path=join(app.getPath("userData"), "hardwareAcceleration");
+try{
+ fs.readFileSync(ha_path, 'utf8');
+ app.disableHardwareAcceleration()
+ console.log("disabled: HA");
+}catch{
+ console.log("enabled: HA");
+}
var window_size;
try {
window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'));
@@ -76,7 +83,9 @@ function createWindow() {
var bit=process.arch;
if(platform=="linux"){
var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,icon: __dirname + '/desk.png'}
- }else{
+ }else if(platform=="win32"){
+ var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true}
+ }else if(platform=="darwin"){
var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true}
}
mainWindow = new BrowserWindow(arg);
@@ -136,8 +145,13 @@ app.on('ready', createWindow);
var onError = function(err,response){
console.error(err,response);
};
-
var ipc = electron.ipcMain;
+ipc.on('minimize', function(e, args) {
+ mainWindow.minimize();
+});
+ipc.on('maximize', function(e, args) {
+ mainWindow.isMaximized() ? mainWindow.unmaximize() : mainWindow.maximize();
+});
ipc.on('native-notf', function(e, args) {
var platform=process.platform;
var bit=process.arch;
@@ -259,7 +273,16 @@ ipc.on('theme-json-list', function(e, arg) {
mainWindow.webContents.send('theme-json-list-response', themes);
});
})
-
+//ハードウェアアクセラレーションの無効化
+ipc.on('ha', function(e, arg) {
+ if(arg=="true"){
+ fs.writeFileSync(ha_path,arg);
+ }else{
+ fs.unlink(ha_path, function (err) {});
+ }
+ app.relaunch()
+ app.exit()
+})
ipc.on('update', function(e, x, y) {
var platform=process.platform;
@@ -527,7 +550,7 @@ ipc.on('nano', function (e, x, y) {
window_pos = [0,0]; // デフォルトバリュー
}
var nanowindow = new BrowserWindow({width: 350, height: 200,
- "transparent": false, // ウィンドウの背景を透過
+ "transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ
"resizable": false });
nanowindow.loadURL('file://' + __dirname + '/nano.html');
diff --git a/app/package.json b/app/package.json
index 3bdc70b9..e78889cb 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "thedesk",
- "version": "17.2.0",
+ "version": "17.3.0",
"description": "TheDesk is a Mastodon client for PC.",
"main": "main.js",
"scripts": {
diff --git a/app/view/en/index.html b/app/view/en/index.html
index 3407cb62..d82534fe 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -32,7 +32,7 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/view/en/setting.html b/app/view/en/setting.html
index 13ade0a4..ea07bd67 100644
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -79,6 +79,14 @@
TheDesk uses this value when it try to save pictures or take screenshots.
+
Disable hardware acceleration
+ Auto restarted
+
+
+
+
+
+
@@ -312,8 +320,9 @@
-
+
+
+
Default accounts of actions
Main account can be set on Account Manager.
@@ -454,6 +463,7 @@
X:Toggle toot box
Ctrl+Enter:Post
Ctrl+Enter+Shift:Post(secondary toot)
+
Alt+Enter:Secondary Toot Button
Ctrl+E:Make all notifications read
Esc:Hide toot box
F5:Super Reload
diff --git a/app/view/ja/index.html b/app/view/ja/index.html
index e8e93a2c..4f7dc743 100644
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -32,7 +32,7 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/view/ja/setting.html b/app/view/ja/setting.html
index db01f2f7..278dfabb 100644
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -79,6 +79,14 @@
画像ダウンロードやスクリーンショットに影響します。
Tips:
@@ -879,4 +874,5 @@ var tlid=0;
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/view/make/language/index.en.json b/app/view/make/language/index.en.json
index e726c091..9c3a7b07 100644
--- a/app/view/make/language/index.en.json
+++ b/app/view/make/language/index.en.json
@@ -141,13 +141,13 @@
"mins":"minutes",
"secs":"seconds",
"warnOnIntegratedTL":"Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
- "helloTheDesk":"
Welcome to TheDesk
Add an account or click add to add a column.",
+ "helloTheDesk":"
Welcome to TheDesk
Add an account or click apps to add a column.",
"addColumn":"Add a column",
"sortColumns":"Sort",
"acctMan":"Account Manager",
"filter":"Filter",
"setting":"Preferences",
- "reverse":"Toot box reverse",
+ "reverse":"Toot button layout reverse",
"f5":"Super Reload",
"nanoDes":"The smallest Mastodon,",
"verTips":"Version",
diff --git a/app/view/make/language/index.ja.json b/app/view/make/language/index.ja.json
index db6e8ffc..5092ea9b 100644
--- a/app/view/make/language/index.ja.json
+++ b/app/view/make/language/index.ja.json
@@ -141,13 +141,13 @@
"mins":"分",
"secs":"秒",
"warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。",
- "helloTheDesk":"