summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-06-30 09:15:11 (GMT)
committer Jaromil <jaromil@dyne.org>2014-06-30 09:20:50 (GMT)
commit499358940347d84c7adc809db348737af87a71d4 (patch)
tree4851a14249db06091d5e74793cc255d0cda67d5e
parentb9e0eab706a82cfeeb23a9d8b9f6c3ad3d033259 (diff)
updates termapk and system to 0.9
-rw-r--r--build/system/etc/skel/xdg/mc/ini147
-rw-r--r--termapk/AndroidManifest.xml7
-rw-r--r--termapk/src/com/spartacusrex/spartacuside/EmulatorView.java6
-rw-r--r--termapk/src/org/dyne/zshaolin/startup/installer.java24
4 files changed, 171 insertions, 13 deletions
diff --git a/build/system/etc/skel/xdg/mc/ini b/build/system/etc/skel/xdg/mc/ini
new file mode 100644
index 0000000..0c085a8
--- /dev/null
+++ b/build/system/etc/skel/xdg/mc/ini
@@ -0,0 +1,147 @@
+[Midnight-Commander]
+verbose=0
+pause_after_run=1
+shell_patterns=1
+auto_save_setup=1
+preallocate_space=0
+auto_menu=0
+use_internal_view=1
+use_internal_edit=1
+clear_before_exec=1
+confirm_delete=1
+confirm_overwrite=1
+confirm_execute=0
+confirm_history_cleanup=1
+confirm_exit=1
+confirm_directory_hotlist_delete=1
+safe_delete=0
+mouse_repeat_rate=100
+double_click_speed=250
+use_8th_bit_as_meta=0
+confirm_view_dir=0
+mouse_move_pages_viewer=1
+mouse_close_dialog=0
+fast_refresh=0
+drop_menus=0
+wrap_mode=1
+old_esc_mode=0
+old_esc_mode_timeout=1000000
+cd_symlinks=1
+show_all_if_ambiguous=0
+max_dirt_limit=10
+use_file_to_guess_type=1
+alternate_plus_minus=0
+only_leading_plus_minus=1
+show_output_starts_shell=0
+xtree_mode=0
+num_history_items_recorded=60
+file_op_compute_totals=1
+classic_progressbar=1
+vfs_timeout=60
+ftpfs_directory_timeout=900
+use_netrc=1
+ftpfs_retry_seconds=30
+ftpfs_always_use_proxy=0
+ftpfs_use_passive_connections=1
+ftpfs_use_passive_connections_over_proxy=0
+ftpfs_use_unix_list_options=1
+ftpfs_first_cd_then_ls=1
+fish_directory_timeout=900
+editor_tab_spacing=8
+editor_word_wrap_line_length=72
+editor_fill_tabs_with_spaces=0
+editor_return_does_auto_indent=1
+editor_backspace_through_tabs=0
+editor_fake_half_tabs=1
+editor_option_save_mode=0
+editor_option_save_position=1
+editor_option_auto_para_formatting=0
+editor_option_typewriter_wrap=0
+editor_edit_confirm_save=1
+editor_syntax_highlighting=1
+editor_persistent_selections=1
+editor_cursor_beyond_eol=0
+editor_cursor_after_inserted_block=0
+editor_visible_tabs=1
+editor_visible_spaces=1
+editor_line_state=0
+editor_simple_statusbar=0
+editor_check_new_line=0
+editor_show_right_margin=0
+editor_group_undo=0
+editor_ask_filename_before_edit=0
+nice_rotating_dash=1
+mcview_remember_file_position=0
+auto_fill_mkdir_name=1
+copymove_persistent_attr=1
+select_flags=6
+editor_backup_extension=~
+editor_filesize_threshold=64M
+mcview_eof=
+ignore_ftp_chattr_errors=true
+skin=default
+
+filepos_max_saved_entries=1024
+
+[Layout]
+message_visible=1
+keybar_visible=1
+xterm_title=1
+output_lines=0
+command_prompt=1
+menubar_visible=1
+free_space=1
+horizontal_split=0
+vertical_equal=1
+left_panel_size=64
+horizontal_equal=1
+top_panel_size=1
+
+[Misc]
+timeformat_recent=%b %e %H:%M
+timeformat_old=%b %e %Y
+ftp_proxy_host=gate
+ftpfs_password=anonymous@
+display_codepage=ASCII
+source_codepage=Other_8_bit
+autodetect_codeset=
+clipboard_store=
+clipboard_paste=
+
+[Colors]
+base_color=
+xterm=
+color_terminals=
+
+linux=
+
+[Panels]
+show_mini_info=true
+kilobyte_si=false
+mix_all_files=false
+show_backups=true
+show_dot_files=true
+fast_reload=false
+fast_reload_msg_shown=false
+mark_moves_down=true
+reverse_files_only=true
+auto_save_setup_panels=false
+navigate_with_arrows=false
+panel_scroll_pages=true
+mouse_move_pages=true
+filetype_mode=true
+permission_mode=false
+torben_fj_mode=false
+quick_search_mode=2
+
+[terminal:xterm]
+up=\\eOA
+down=\\eOB
+left=\\eOD
+right=\\eOC
+
+[Panelize]
+Find *.orig after patching=find . -name \\*.orig -print
+Find SUID and SGID programs=find . \\( \\( -perm -04000 -a -perm +011 \\) -o \\( -perm -02000 -a -perm +01 \\) \\) -print
+Find rejects after patching=find . -name \\*.rej -print
+Modified git files=git ls-files --modified
diff --git a/termapk/AndroidManifest.xml b/termapk/AndroidManifest.xml
index a14b832..4d19ff3 100644
--- a/termapk/AndroidManifest.xml
+++ b/termapk/AndroidManifest.xml
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.dyne.zshaolin"
- android:versionName="0.7.1"
- android:versionCode="10">
+ android:versionName="0.9"
+ android:versionCode="12">
<!--android:installLocation="preferExternal" -->
<uses-permission android:name="android.permission.INTERNET" />
@@ -55,7 +55,8 @@
</application>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="14"/>
- <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
+<!-- <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/> -->
+ <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
<!-- <uses-feature android:name="android.hardware.touchscreen" android:required="false" />-->
</manifest>
diff --git a/termapk/src/com/spartacusrex/spartacuside/EmulatorView.java b/termapk/src/com/spartacusrex/spartacuside/EmulatorView.java
index 000a8b9..5be0dc6 100644
--- a/termapk/src/com/spartacusrex/spartacuside/EmulatorView.java
+++ b/termapk/src/com/spartacusrex/spartacuside/EmulatorView.java
@@ -44,7 +44,7 @@ import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.view.inputmethod.CompletionInfo;
-//import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.CorrectionInfo;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.ExtractedText;
import android.view.inputmethod.ExtractedTextRequest;
@@ -462,12 +462,12 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
return true;
}
- /*public boolean commitCorrection (CorrectionInfo correctionInfo) {
+ public boolean commitCorrection (CorrectionInfo correctionInfo) {
if (TermDebug.LOG_IME) {
Log.w(TAG, "commitCorrection");
}
return true;
- }*/
+ }
public boolean commitText(CharSequence text, int newCursorPosition) {
if (TermDebug.LOG_IME) {
diff --git a/termapk/src/org/dyne/zshaolin/startup/installer.java b/termapk/src/org/dyne/zshaolin/startup/installer.java
index 28a4c61..6cd2bcb 100644
--- a/termapk/src/org/dyne/zshaolin/startup/installer.java
+++ b/termapk/src/org/dyne/zshaolin/startup/installer.java
@@ -30,8 +30,8 @@ import org.dyne.zshaolin.startup.setup.filemanager;
public class installer extends Activity implements OnClickListener{
//THE MAIN INSTALL VALUE
- public static int CURRENT_INSTALL_SYSTEM_NUM = 10;
- public static String CURRENT_INSTALL_SYSTEM = "System v0.8";
+ public static int CURRENT_INSTALL_SYSTEM_NUM = 12;
+ public static String CURRENT_INSTALL_SYSTEM = "System v0.9";
public static String CURRENT_INSTALL_ASSETFILE = "system.tar.lzma.mp3";
private ProgressDialog mInstallProgress;
@@ -203,22 +203,24 @@ public class installer extends Activity implements OnClickListener{
// zshrc
File zshrc = new File(skel,"zshrc");
File zshrcu = new File(home,".zshrc");
- if(!zshrcu.exists() || mOverwriteAll){
+ // force overwrite of zshrc because is our zsh init file
+ // if(!zshrcu.exists() || mOverwriteAll){
pp = Runtime.getRuntime().exec
(busytar.getPath()+
" cp -f "+zshrc.getPath()+" "+zshrcu.getPath(),env,home);
pp.waitFor();
- }
+ // force }
// grml.conf
File grml = new File(skel,"grml.conf");
File grmlu = new File(home,".grml.conf");
- if(!grmlu.exists() || mOverwriteAll){
+ // force overwrite of grml.conf as we update it
+ // if(!grmlu.exists() || mOverwriteAll){
pp = Runtime.getRuntime().exec
(busytar.getPath()+
" cp -f "+grml.getPath()+" "+grmlu.getPath(),env,home);
pp.waitFor();
- }
+ // }
// vimrc
File vimrc = new File(skel,"vimrc");
@@ -230,7 +232,15 @@ public class installer extends Activity implements OnClickListener{
pp.waitFor();
}
-
+ // xdg config
+ File xdg = new File(skel,"xdg");
+ File xdgu = new File(home,".config");
+ if(!xdgu.exists() || mOverwriteAll){
+ pp = Runtime.getRuntime().exec
+ (busytar.getPath()+
+ " cp -rf "+xdg.getPath()+" "+xdgu.getPath(),env,home);
+ pp.waitFor();
+ }
//Create a link to the sdcard
File sdcard = Environment.getExternalStorageDirectory();