OSDN Git Service

Merge branch テーブルのtooltipにサムネイル情報を表示する機能
authoryukihane <yukihane.feather@gmail.com>
Sun, 18 Sep 2011 08:00:24 +0000 (17:00 +0900)
committeryukihane <yukihane.feather@gmail.com>
Sun, 18 Sep 2011 08:00:24 +0000 (17:00 +0900)
.gitignore
frontend/src/yukihane/inqubus/config/Config.java
frontend/src/yukihane/inqubus/gui/ConfigDialog.java
frontend/tmp/.gitignore [new file with mode: 0644]

index 4439201..6a8ae56 100644 (file)
@@ -11,10 +11,10 @@ dist/
 private/
 
 /frontend/dist/
-/frontend/\[out\]comment/
-/frontend/\[out\]converted/
-/frontend/\[out\]tcomment/
-/frontend/\[out\]video/
+/frontend/tmp/
+/frontend/_video/
+/frontend/_comment/
+/frontend/__converted/
 /frontend/\[log\]vhext.txt
 /frontend/saccubus.xml
 /frontend/inqubus.xml
index 106f74e..a11a1fd 100644 (file)
@@ -595,7 +595,7 @@ public enum Config {
     private static final String SYSTEM_TEMPDIR = "system.tempdir";
 
     public String getSystemTempDir() {
-        return config.getString(SYSTEM_TEMPDIR, ".");
+        return config.getString(SYSTEM_TEMPDIR, "tmp");
     }
 
     public void setSystemTempDir(String s) {
index ea338f9..720a1f9 100644 (file)
@@ -145,7 +145,7 @@ public class ConfigDialog extends JDialog {
 
 
         final JButton btnCookie = new JButton("...");
-        btnCookie.addActionListener(new FileChooseActionListener(this, JFileChooser.DIRECTORIES_ONLY, fldCookie));
+        btnCookie.addActionListener(new FileChooseActionListener(this, JFileChooser.FILES_AND_DIRECTORIES, fldCookie));
 
         final ButtonGroup grpLoginType = new ButtonGroup();
         grpLoginType.add(btnAccount);
diff --git a/frontend/tmp/.gitignore b/frontend/tmp/.gitignore
new file mode 100644 (file)
index 0000000..e69de29