Removed features reverted...

triochi / QtAdb

Android File Manager using Android Debug Bridge and based on Qt

http://qtadb.wordpress.com

165 stars 69 forks source link

Removed features reverted... #7

Closed nijel8 closed 12 years ago

nijel8 commented 12 years ago

OK, guys, all features are back in and cwm recovery detection is added for switching the two recovery widgets. Let me know if there is something else to fix.

What is different from current official build 0.8.1:

Files Page: -double click on phone file (both panes) opens file in PC with the associated program for that extension with option to edit the file and save it back to phone; -added "Properties" in phone files/folders right click context menu with permissions changing capabilities; -switching left pane between PC/phone files now remembers last folder view for both; -left paths combo box now works for phone files too when switching left pane to phone files;

Apps Page: -major speedup displaying apps after the initial first run when apps info is collected; -fixed all functions, now all buttons and actions works as they should; -now you can backup and restore apps and data to any folder on /sdcard or PC, set backup folder location in Settings first; -option added to Backups context menu to add app/data if missing from existing previous backup;

New CWM Page replaces current Recovery Page if CWM Recovery is installed on phone and detected. If CWM Recovery is not detected, the current Recovery Page is used. What can be done in the New CWM Page: -run fix_permissions in Android OS mode, not in recovery mode. As you may know fix_permissions in CWM recovery is broken; -Fix/Undo Fix Market Cache Download; -Flash new Recovery; -Mount/Unmount any partition in recovery mode, Remount /system with read-write/read-only access in Android OS mode; -Repartitioning SD Card with /sd-ext partition (your choice of size and type) with option to backup /sdcard content before, and restoring it after the operation; -Wipe data/factory reset, cache, dalvik-cache, battery stats (your choice) in recovery mode; -Install zip of your choice from /sdcard; -Backup ROM to any folder on /sdcard or to default CWM location with option for Backup md5 sum validation after phone reboots back to Android OS, ensures proper backup is done; -Restore nandroid Backup with option to choose which partitions to restore(select all for full restore) and preliminary md5 sum validation for double safety; -One click Update ROM function which wipes cache and dalvik-cache before flashing. If Link2SD is detected on your phone you have an option to automatically copy its sd-ext mount script from current ROM to the new updated ROM saving you one reboot. Link2SD will not even know you updated the ROM; -One click ROM Flash with full wipe and options to install zips before/after(or both) the flash - this procedure reboots phone to Recovery, wipes dalvik-cache, formats /boot, /system, /data and /cache partitions, installs zip before(if selected), installs the new ROM, installs zip after(if selected) and reboots back to Android OS.

Detailed information in Status Window is displayed for all operations taking place in real time. After phone reboots back to Android OS, the last CWM recovery log is displayed so you can spot any errors occurred during the last operation.

And probably something else I forgot about;

All bugs fixed(I believe).

I want to thank and give credits to the guys (couldn't find their names) created some of the tools I'm using to make the new features works.

triochi commented 12 years ago

OK. Now it's better. I can't check all your features on master branch, because phone pane is empty for me. I will accept the patch, and will upgrade the master branch with the "ls using sockets" feature from the work branch.

nijel8 commented 12 years ago

Phone pane is empty? What output are you getting if you run "adb shell ls -l" (no busybox prefix)?

btw what is this "ls using sockets" feature?

triochi commented 12 years ago

There is a solution for ls incompatible formats in the work branch

this is my output:

ls -l drwxr-xr-x root root 2000-01-01 03:51 acct drwxrwx--- system cache 2012-01-07 15:56 cache dr-x------ root root 2000-01-01 03:51 config lrwxrwxrwx root root 2000-01-01 03:51 d -> /sys/kernel/debug drwxrwx--x system system 2000-01-01 01:33 data -rw-r--r-- root root 120 1970-01-01 00:00 default.prop drwxr-xr-x root root 2000-01-01 03:51 dev lrwxrwxrwx root root 2000-01-01 03:51 etc -> /system/etc drwxr-xr-x root root 1970-01-01 00:00 factory -rwxr-x--- root root 98676 1970-01-01 00:00 init -rwxr-x--- root root 2344 1970-01-01 00:00 init.goldfish.rc -rwxr-x--- root root 5586 1970-01-01 00:00 init.omap4blazeboard.rc -rwxr-x--- root root 4059 1970-01-01 00:00 init.omap4blazeboard.usb.rc -rwxr-x--- root root 17067 1970-01-01 00:00 init.rc drwxrwxr-x root system 2000-01-01 03:51 mnt dr-xr-xr-x root root 1970-01-01 00:00 proc drwx------ root root 2011-12-15 08:53 root drwxr-x--- root root 1970-01-01 00:00 sbin lrwxrwxrwx root root 2000-01-01 03:51 sdcard -> /mnt/sdcard drwxr-xr-x root root 2000-01-01 03:51 sys drwxr-xr-x root root 1970-01-01 00:00 system -rw-r--r-- root root 272 1970-01-01 00:00 ueventd.goldfish.rc -rw-r--r-- root root 328 1970-01-01 00:00 ueventd.omap4blazeboard.rc -rw-r--r-- root root 3825 1970-01-01 00:00 ueventd.rc lrwxrwxrwx root root 2000-01-01 03:51 vendor -> /system/vendor

2012/3/23 nijel8 < reply@reply.github.com

Phone pane is empty? What output are you getting if you run "adb shell ls -l" (no busybox prefix)?

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4658672

nijel8 commented 12 years ago

Looks good... I though it might be from busybox prefix missing in my phone.cpp commands. So its not that. I'll check filewidget.cpp now. Does the current master branch you just merged works for you now?

triochi commented 12 years ago

I'll need some time to take the changes from work branch for the ls command substitute

2012/3/23 nijel8 < reply@reply.github.com

iLooks good... I though it might be from busybox prefix missing in my phone.cpp commands. So its not that. I'll check filewidget.cpp now. Does the current master branch you just merged works for you now?

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4659049

nijel8 commented 12 years ago

Sure. Let me know when its done to sync my local. Thanks.

7ymekk commented 12 years ago

Hey,

why did You merged Your changes to the QtADB master???? it can't go like this. You fork or Your own branch and You are commiting to it. leave master branch to us. You removed all languages from resources. support for many languages is one of the biggest cons of QtADB

Regards Jakub

2012/3/22 nijel8 reply@reply.github.com:

OK, guys, all features are back in and cwm recovery detection is added for switching the two recovery widgets. Let me know if there is something else to fix.

What is different from current official build 0.8.1:

Files Page: -double click on phone file (both panes) opens file in PC with the associated program for that extension with option to edit the file and save it back to phone; -added "Properties" in phone files/folders right click context menu with permissions changing capabilities; -switching left pane between PC/phone files now remembers last folder view for both; -left paths combo box now works for phone files too when switching left pane to phone files;

Apps Page: -major speedup displaying apps after the initial first run when apps info is collected; -fixed all functions, now all buttons and actions works as they should; -now you can backup and restore apps and data to any folder on /sdcard or PC, set backup folder location in Settings first; -option added to Backups context menu to add app/data if missing from existing previous backup;

New CWM Page replaces current Recovery Page if CWM Recovery is installed on phone and detected. If CWM Recovery is not detected, the current Recovery Page is used. What can be done in the New CWM Page: -run fix_permissions in Android OS mode, not in recovery mode. As you may know fix_permissions in CWM recovery is broken; -Fix/Undo Fix Market Cache Download; -Flash new Recovery; -Mount/Unmount any partition in recovery mode, Remount /system with read-write/read-only access in Android OS mode; -Repartitioning SD Card with /sd-ext partition (your choice of size and type) with option to backup /sdcard content before, and restoring it after the operation; -Wipe data/factory reset, cache, dalvik-cache, battery stats (your choice) in recovery mode; -Install zip of your choice from /sdcard; -Backup ROM to any folder on /sdcard or to default CWM location with option for Backup md5 sum validation after phone reboots back to Android OS, ensures proper backup is done; -Restore nandroid Backup with option to choose which partitions to restore(select all for full restore) and preliminary md5 sum validation for double safety; -One click Update ROM function which wipes cache and dalvik-cache before flashing. If Link2SD is detected on your phone you have an option to automatically copy its sd-ext mount script from current ROM to the new updated ROM saving you one reboot. Link2SD will not even know you updated the ROM; -One click ROM Flash with full wipe and options to install zips before/after(or both) the flash - this procedure reboots phone to Recovery, wipes dalvik-cache, formats /boot, /system, /data and /cache partitions, installs zip before(if selected), installs the new ROM, installs zip after(if selected) and reboots back to Android OS.

Detailed information in Status Window is displayed for all operations taking place in real time. After phone reboots back to Android OS, the last CWM recovery log is displayed so you can spot any errors occurred during the last operation.

And probably something else I forgot about;

All bugs fixed(I believe).

I want to thank and give credits to the guys (couldn't find their names) created some of the tools I'm using to make the new features works.

You can merge this Pull Request by running:

git pull https://github.com/nijel8/cwm_edition master

Or you can view, comment on it, or merge it online at:

https://github.com/triochi/QtAdb/pull/7

-- Commit Summary --

What is different from current official build 0.8.1:

What is different from current official build 0.8.1:

-- File Changes --

A Changes.txt (36) M QtADB.pro (12) M QtADB.pro.user (433) M classes/computer.cpp (1) M classes/models/apptablemodel.cpp (39) M classes/models/backuptablemodel.cpp (41) M classes/models/filetablemodel.cpp (1) M classes/models/messagethreadmodel.cpp (6) M classes/mytableview.cpp (20) M classes/mytableview.h (2) M classes/phone.cpp (34) M classes/updateapp.cpp (2) M dialogs/aboutdialog.cpp (2) M dialogs/aboutdialog.ui (7) M dialogs/appdialog.cpp (185) M dialogs/appdialog.ui (3) M dialogs/appinfo.cpp (127) M dialogs/appinfo.ui (3) M dialogs/connectWifi.cpp (2) M dialogs/connectWifi.h (2) M dialogs/connectWifi.ui (3) M dialogs/dialogkopiuj.cpp (91) M dialogs/dialogkopiuj.h (6) M dialogs/dialogkopiuj.ui (10) A dialogs/fipdialog.cpp (477) A dialogs/fipdialog.h (72) A dialogs/fipdialog.ui (477) M dialogs/logcatdialog.cpp (31) M dialogs/logcatdialog.h (3) M dialogs/logcatdialog.ui (18) M dialogs/mainwindow.cpp (140) M dialogs/mainwindow.h (9) M dialogs/registerdialog.cpp (6) M dialogs/registerdialog.ui (7) M languages/qtadb_zh.ts (140) M main.cpp (11) M qml/messages/delegates/ThreadDelegate.qml (10) A tools/dofixmarket.sh (5) A tools/dolink2sd.sh (4) A tools/domd5sum.sh (3) A tools/dopartition.sh (13) A tools/dowipebatterystats.sh (4) A tools/dowipedalvikcache.sh (11) A tools/dowipedalviklink2sd.sh (14) A tools/e2fsck (0) A tools/fix_permissions (484) A tools/flash_image (0) A tools/parted (0) A tools/sdparted (655) A tools/tune2fs (0) A tools/undofixmarket.sh (5) M widgets/appwidget.cpp (496) M widgets/appwidget.h (28) M widgets/appwidget.ui (18) M widgets/contactwidget.h (2) A widgets/cwmwidget.cpp (1815) A widgets/cwmwidget.h (159) A widgets/cwmwidget.ui (1791) M widgets/filewidget.cpp (441) M widgets/filewidget.h (6) M widgets/filewidget.ui (9) M widgets/messagewidget.cpp (4) M widgets/phoneinfowidget.cpp (6) M widgets/phoneinfowidget.ui (2) M widgets/recoverywidget.cpp (16) A widgets/sdfiles.h (22) A widgets/sdfiles.ui (21) M widgets/settingswidget.cpp (116) M widgets/settingswidget.h (16) M widgets/settingswidget.ui (90) M widgets/shellwidget.cpp (1106) M widgets/shellwidget.h (5) M zasoby.qrc (15)

-- Patch Links --

https://github.com/triochi/QtAdb/pull/7.patch https://github.com/triochi/QtAdb/pull/7.diff

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7

triochi commented 12 years ago

2012/3/23 7ymekk < reply@reply.github.com

Hey,

why did You merged Your changes to the QtADB master???? it can't go like this. You fork or Your own branch and You are commiting to it. leave master branch to us. You removed all languages from resources. support for many languages is one of the biggest cons of QtADB

Regards Jakub

2012/3/22 nijel8 reply@reply.github.com:

OK, guys, all features are back in and cwm recovery detection is added for switching the two recovery widgets. Let me know if there is something else to fix.

What is different from current official build 0.8.1:

Files Page: -double click on phone file (both panes) opens file in PC with the associated program for that extension with option to edit the file and save it back to phone; -added "Properties" in phone files/folders right click context menu with permissions changing capabilities; -switching left pane between PC/phone files now remembers last folder view for both; -left paths combo box now works for phone files too when switching left pane to phone files;

Apps Page: -major speedup displaying apps after the initial first run when apps info is collected; -fixed all functions, now all buttons and actions works as they should; -now you can backup and restore apps and data to any folder on /sdcard or PC, set backup folder location in Settings first; -option added to Backups context menu to add app/data if missing from existing previous backup;

New CWM Page replaces current Recovery Page if CWM Recovery is installed on phone and detected. If CWM Recovery is not detected, the current Recovery Page is used. What can be done in the New CWM Page: -run fix_permissions in Android OS mode, not in recovery mode. As you may know fix_permissions in CWM recovery is broken; -Fix/Undo Fix Market Cache Download; -Flash new Recovery; -Mount/Unmount any partition in recovery mode, Remount /system with read-write/read-only access in Android OS mode; -Repartitioning SD Card with /sd-ext partition (your choice of size and type) with option to backup /sdcard content before, and restoring it after the operation; -Wipe data/factory reset, cache, dalvik-cache, battery stats (your choice) in recovery mode; -Install zip of your choice from /sdcard; -Backup ROM to any folder on /sdcard or to default CWM location with option for Backup md5 sum validation after phone reboots back to Android OS, ensures proper backup is done; -Restore nandroid Backup with option to choose which partitions to restore(select all for full restore) and preliminary md5 sum validation for double safety; -One click Update ROM function which wipes cache and dalvik-cache before flashing. If Link2SD is detected on your phone you have an option to automatically copy its sd-ext mount script from current ROM to the new updated ROM saving you one reboot. Link2SD will not even know you updated the ROM; -One click ROM Flash with full wipe and options to install zips before/after(or both) the flash - this procedure reboots phone to Recovery, wipes dalvik-cache, formats /boot, /system, /data and /cache partitions, installs zip before(if selected), installs the new ROM, installs zip after(if selected) and reboots back to Android OS.

Detailed information in Status Window is displayed for all operations taking place in real time. After phone reboots back to Android OS, the last CWM recovery log is displayed so you can spot any errors occurred during the last operation.

And probably something else I forgot about;

All bugs fixed(I believe).

I want to thank and give credits to the guys (couldn't find their names) created some of the tools I'm using to make the new features works.

You can merge this Pull Request by running:

git pull https://github.com/nijel8/cwm_edition master

Or you can view, comment on it, or merge it online at:

https://github.com/triochi/QtAdb/pull/7

-- Commit Summary --

What is different from current official build 0.8.1:

What is different from current official build 0.8.1:

-- File Changes --

A Changes.txt (36) M QtADB.pro (12) M QtADB.pro.user (433) M classes/computer.cpp (1) M classes/models/apptablemodel.cpp (39) M classes/models/backuptablemodel.cpp (41) M classes/models/filetablemodel.cpp (1) M classes/models/messagethreadmodel.cpp (6) M classes/mytableview.cpp (20) M classes/mytableview.h (2) M classes/phone.cpp (34) M classes/updateapp.cpp (2) M dialogs/aboutdialog.cpp (2) M dialogs/aboutdialog.ui (7) M dialogs/appdialog.cpp (185) M dialogs/appdialog.ui (3) M dialogs/appinfo.cpp (127) M dialogs/appinfo.ui (3) M dialogs/connectWifi.cpp (2) M dialogs/connectWifi.h (2) M dialogs/connectWifi.ui (3) M dialogs/dialogkopiuj.cpp (91) M dialogs/dialogkopiuj.h (6) M dialogs/dialogkopiuj.ui (10) A dialogs/fipdialog.cpp (477) A dialogs/fipdialog.h (72) A dialogs/fipdialog.ui (477) M dialogs/logcatdialog.cpp (31) M dialogs/logcatdialog.h (3) M dialogs/logcatdialog.ui (18) M dialogs/mainwindow.cpp (140) M dialogs/mainwindow.h (9) M dialogs/registerdialog.cpp (6) M dialogs/registerdialog.ui (7) M languages/qtadb_zh.ts (140) M main.cpp (11) M qml/messages/delegates/ThreadDelegate.qml (10) A tools/dofixmarket.sh (5) A tools/dolink2sd.sh (4) A tools/domd5sum.sh (3) A tools/dopartition.sh (13) A tools/dowipebatterystats.sh (4) A tools/dowipedalvikcache.sh (11) A tools/dowipedalviklink2sd.sh (14) A tools/e2fsck (0) A tools/fix_permissions (484) A tools/flash_image (0) A tools/parted (0) A tools/sdparted (655) A tools/tune2fs (0) A tools/undofixmarket.sh (5) M widgets/appwidget.cpp (496) M widgets/appwidget.h (28) M widgets/appwidget.ui (18) M widgets/contactwidget.h (2) A widgets/cwmwidget.cpp (1815) A widgets/cwmwidget.h (159) A widgets/cwmwidget.ui (1791) M widgets/filewidget.cpp (441) M widgets/filewidget.h (6) M widgets/filewidget.ui (9) M widgets/messagewidget.cpp (4) M widgets/phoneinfowidget.cpp (6) M widgets/phoneinfowidget.ui (2) M widgets/recoverywidget.cpp (16) A widgets/sdfiles.h (22) A widgets/sdfiles.ui (21) M widgets/settingswidget.cpp (116) M widgets/settingswidget.h (16) M widgets/settingswidget.ui (90) M widgets/shellwidget.cpp (1106) M widgets/shellwidget.h (5) M zasoby.qrc (15)

-- Patch Links --

https://github.com/triochi/QtAdb/pull/7.patch https://github.com/triochi/QtAdb/pull/7.diff

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4662708

triochi commented 12 years ago

This was a mistake. I see now patches are not mature. I need to rework them. Do you want to revert the patch? Dimitar

2012/3/23 7ymekk < reply@reply.github.com

Hey,

why did You merged Your changes to the QtADB master???? it can't go like this. You fork or Your own branch and You are commiting to it. leave master branch to us. You removed all languages from resources. support for many languages is one of the biggest cons of QtADB

Regards Jakub

2012/3/22 nijel8 reply@reply.github.com:

OK, guys, all features are back in and cwm recovery detection is added for switching the two recovery widgets. Let me know if there is something else to fix.

What is different from current official build 0.8.1:

Files Page: -double click on phone file (both panes) opens file in PC with the associated program for that extension with option to edit the file and save it back to phone; -added "Properties" in phone files/folders right click context menu with permissions changing capabilities; -switching left pane between PC/phone files now remembers last folder view for both; -left paths combo box now works for phone files too when switching left pane to phone files;

Apps Page: -major speedup displaying apps after the initial first run when apps info is collected; -fixed all functions, now all buttons and actions works as they should; -now you can backup and restore apps and data to any folder on /sdcard or PC, set backup folder location in Settings first; -option added to Backups context menu to add app/data if missing from existing previous backup;

New CWM Page replaces current Recovery Page if CWM Recovery is installed on phone and detected. If CWM Recovery is not detected, the current Recovery Page is used. What can be done in the New CWM Page: -run fix_permissions in Android OS mode, not in recovery mode. As you may know fix_permissions in CWM recovery is broken; -Fix/Undo Fix Market Cache Download; -Flash new Recovery; -Mount/Unmount any partition in recovery mode, Remount /system with read-write/read-only access in Android OS mode; -Repartitioning SD Card with /sd-ext partition (your choice of size and type) with option to backup /sdcard content before, and restoring it after the operation; -Wipe data/factory reset, cache, dalvik-cache, battery stats (your choice) in recovery mode; -Install zip of your choice from /sdcard; -Backup ROM to any folder on /sdcard or to default CWM location with option for Backup md5 sum validation after phone reboots back to Android OS, ensures proper backup is done; -Restore nandroid Backup with option to choose which partitions to restore(select all for full restore) and preliminary md5 sum validation for double safety; -One click Update ROM function which wipes cache and dalvik-cache before flashing. If Link2SD is detected on your phone you have an option to automatically copy its sd-ext mount script from current ROM to the new updated ROM saving you one reboot. Link2SD will not even know you updated the ROM; -One click ROM Flash with full wipe and options to install zips before/after(or both) the flash - this procedure reboots phone to Recovery, wipes dalvik-cache, formats /boot, /system, /data and /cache partitions, installs zip before(if selected), installs the new ROM, installs zip after(if selected) and reboots back to Android OS.

Detailed information in Status Window is displayed for all operations taking place in real time. After phone reboots back to Android OS, the last CWM recovery log is displayed so you can spot any errors occurred during the last operation.

And probably something else I forgot about;

All bugs fixed(I believe).

I want to thank and give credits to the guys (couldn't find their names) created some of the tools I'm using to make the new features works.

You can merge this Pull Request by running:

git pull https://github.com/nijel8/cwm_edition master

Or you can view, comment on it, or merge it online at:

https://github.com/triochi/QtAdb/pull/7

-- Commit Summary --

What is different from current official build 0.8.1:

What is different from current official build 0.8.1:

-- File Changes --

A Changes.txt (36) M QtADB.pro (12) M QtADB.pro.user (433) M classes/computer.cpp (1) M classes/models/apptablemodel.cpp (39) M classes/models/backuptablemodel.cpp (41) M classes/models/filetablemodel.cpp (1) M classes/models/messagethreadmodel.cpp (6) M classes/mytableview.cpp (20) M classes/mytableview.h (2) M classes/phone.cpp (34) M classes/updateapp.cpp (2) M dialogs/aboutdialog.cpp (2) M dialogs/aboutdialog.ui (7) M dialogs/appdialog.cpp (185) M dialogs/appdialog.ui (3) M dialogs/appinfo.cpp (127) M dialogs/appinfo.ui (3) M dialogs/connectWifi.cpp (2) M dialogs/connectWifi.h (2) M dialogs/connectWifi.ui (3) M dialogs/dialogkopiuj.cpp (91) M dialogs/dialogkopiuj.h (6) M dialogs/dialogkopiuj.ui (10) A dialogs/fipdialog.cpp (477) A dialogs/fipdialog.h (72) A dialogs/fipdialog.ui (477) M dialogs/logcatdialog.cpp (31) M dialogs/logcatdialog.h (3) M dialogs/logcatdialog.ui (18) M dialogs/mainwindow.cpp (140) M dialogs/mainwindow.h (9) M dialogs/registerdialog.cpp (6) M dialogs/registerdialog.ui (7) M languages/qtadb_zh.ts (140) M main.cpp (11) M qml/messages/delegates/ThreadDelegate.qml (10) A tools/dofixmarket.sh (5) A tools/dolink2sd.sh (4) A tools/domd5sum.sh (3) A tools/dopartition.sh (13) A tools/dowipebatterystats.sh (4) A tools/dowipedalvikcache.sh (11) A tools/dowipedalviklink2sd.sh (14) A tools/e2fsck (0) A tools/fix_permissions (484) A tools/flash_image (0) A tools/parted (0) A tools/sdparted (655) A tools/tune2fs (0) A tools/undofixmarket.sh (5) M widgets/appwidget.cpp (496) M widgets/appwidget.h (28) M widgets/appwidget.ui (18) M widgets/contactwidget.h (2) A widgets/cwmwidget.cpp (1815) A widgets/cwmwidget.h (159) A widgets/cwmwidget.ui (1791) M widgets/filewidget.cpp (441) M widgets/filewidget.h (6) M widgets/filewidget.ui (9) M widgets/messagewidget.cpp (4) M widgets/phoneinfowidget.cpp (6) M widgets/phoneinfowidget.ui (2) M widgets/recoverywidget.cpp (16) A widgets/sdfiles.h (22) A widgets/sdfiles.ui (21) M widgets/settingswidget.cpp (116) M widgets/settingswidget.h (16) M widgets/settingswidget.ui (90) M widgets/shellwidget.cpp (1106) M widgets/shellwidget.h (5) M zasoby.qrc (15)

-- Patch Links --

https://github.com/triochi/QtAdb/pull/7.patch https://github.com/triochi/QtAdb/pull/7.diff

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4662708

triochi commented 12 years ago

The HEAD was forced back. This means the patch is not in master branch anymore. I hope to rework it. Unfortunately I cannot test all the new features (e.g. the recovery). I will add the new features on top of the other changes in work branch. And will not push until the code is purified.

7ymekk commented 12 years ago

OK, I hope I will find some time this weekend to study some source code and check what is new but for now I can say that the new recovery and chmod window are nice features ;)

Best regards Jakub

2012/3/23 triochi reply@reply.github.com:

The HEAD was forced back. This means the patch is not in master branch anymore. I hope to rework it. Unfortunately I cannot test all the new features (e.g. the recovery). I will add the new features on top of the other changes in work branch. And will not push until the code is purified.

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4663764

nijel8 commented 12 years ago

No problem... Take your time. I reverted all features including the language files in my fork so all is good. I merge to my fork. I don't touch your master branch or any other branch that is not mine ever. I respect your work and other people's work. It's your call if you want to merge my code or not to your master. The only think I want from you guys is to let me publish my modified QtAdb for testing with the clear statement that it is not officially supported by you and to not bother you with any questions or issues. How's that sounds?

nijel8 commented 12 years ago

What do you mean? Do you want me to delete my fork, make new one from your master and merge my code in my new fork so its clean?

Nick

-----Original Message----- From: triochi Sent: Friday, March 23, 2012 12:38 PM To: nijel8 Subject: Re: [QtAdb] Removed features reverted... (#7)

This was a mistake. I see now patches are not mature. I need to rework them. Do you want to revert the patch? Dimitar

2012/3/23 7ymekk < reply@reply.github.com

Hey,

why did You merged Your changes to the QtADB master???? it can't go like this. You fork or Your own branch and You are commiting to it. leave master branch to us. You removed all languages from resources. support for many languages is one of the biggest cons of QtADB

Regards Jakub

2012/3/22 nijel8 reply@reply.github.com:

OK, guys, all features are back in and cwm recovery detection is added for switching the two recovery widgets. Let me know if there is something else to fix.

What is different from current official build 0.8.1:

Files Page: -double click on phone file (both panes) opens file in PC with the associated program for that extension with option to edit the file and save it back to phone; -added "Properties" in phone files/folders right click context menu with permissions changing capabilities; -switching left pane between PC/phone files now remembers last folder view for both; -left paths combo box now works for phone files too when switching left pane to phone files;

Apps Page: -major speedup displaying apps after the initial first run when apps info is collected; -fixed all functions, now all buttons and actions works as they should; -now you can backup and restore apps and data to any folder on /sdcard or PC, set backup folder location in Settings first; -option added to Backups context menu to add app/data if missing from existing previous backup;

New CWM Page replaces current Recovery Page if CWM Recovery is installed on phone and detected. If CWM Recovery is not detected, the current Recovery Page is used. What can be done in the New CWM Page: -run fix_permissions in Android OS mode, not in recovery mode. As you may know fix_permissions in CWM recovery is broken; -Fix/Undo Fix Market Cache Download; -Flash new Recovery; -Mount/Unmount any partition in recovery mode, Remount /system with read-write/read-only access in Android OS mode; -Repartitioning SD Card with /sd-ext partition (your choice of size and type) with option to backup /sdcard content before, and restoring it after the operation; -Wipe data/factory reset, cache, dalvik-cache, battery stats (your choice) in recovery mode; -Install zip of your choice from /sdcard; -Backup ROM to any folder on /sdcard or to default CWM location with option for Backup md5 sum validation after phone reboots back to Android OS, ensures proper backup is done; -Restore nandroid Backup with option to choose which partitions to restore(select all for full restore) and preliminary md5 sum validation for double safety; -One click Update ROM function which wipes cache and dalvik-cache before flashing. If Link2SD is detected on your phone you have an option to automatically copy its sd-ext mount script from current ROM to the new updated ROM saving you one reboot. Link2SD will not even know you updated the ROM; -One click ROM Flash with full wipe and options to install zips before/after(or both) the flash - this procedure reboots phone to Recovery, wipes dalvik-cache, formats /boot, /system, /data and /cache partitions, installs zip before(if selected), installs the new ROM, installs zip after(if selected) and reboots back to Android OS.

Detailed information in Status Window is displayed for all operations taking place in real time. After phone reboots back to Android OS, the last CWM recovery log is displayed so you can spot any errors occurred during the last operation.

And probably something else I forgot about;

All bugs fixed(I believe).

I want to thank and give credits to the guys (couldn't find their names) created some of the tools I'm using to make the new features works.

You can merge this Pull Request by running:

git pull https://github.com/nijel8/cwm_edition master

Or you can view, comment on it, or merge it online at:

https://github.com/triochi/QtAdb/pull/7

-- Commit Summary --

What is different from current official build 0.8.1:

What is different from current official build 0.8.1:

-- File Changes --

A Changes.txt (36) M QtADB.pro (12) M QtADB.pro.user (433) M classes/computer.cpp (1) M classes/models/apptablemodel.cpp (39) M classes/models/backuptablemodel.cpp (41) M classes/models/filetablemodel.cpp (1) M classes/models/messagethreadmodel.cpp (6) M classes/mytableview.cpp (20) M classes/mytableview.h (2) M classes/phone.cpp (34) M classes/updateapp.cpp (2) M dialogs/aboutdialog.cpp (2) M dialogs/aboutdialog.ui (7) M dialogs/appdialog.cpp (185) M dialogs/appdialog.ui (3) M dialogs/appinfo.cpp (127) M dialogs/appinfo.ui (3) M dialogs/connectWifi.cpp (2) M dialogs/connectWifi.h (2) M dialogs/connectWifi.ui (3) M dialogs/dialogkopiuj.cpp (91) M dialogs/dialogkopiuj.h (6) M dialogs/dialogkopiuj.ui (10) A dialogs/fipdialog.cpp (477) A dialogs/fipdialog.h (72) A dialogs/fipdialog.ui (477) M dialogs/logcatdialog.cpp (31) M dialogs/logcatdialog.h (3) M dialogs/logcatdialog.ui (18) M dialogs/mainwindow.cpp (140) M dialogs/mainwindow.h (9) M dialogs/registerdialog.cpp (6) M dialogs/registerdialog.ui (7) M languages/qtadb_zh.ts (140) M main.cpp (11) M qml/messages/delegates/ThreadDelegate.qml (10) A tools/dofixmarket.sh (5) A tools/dolink2sd.sh (4) A tools/domd5sum.sh (3) A tools/dopartition.sh (13) A tools/dowipebatterystats.sh (4) A tools/dowipedalvikcache.sh (11) A tools/dowipedalviklink2sd.sh (14) A tools/e2fsck (0) A tools/fix_permissions (484) A tools/flash_image (0) A tools/parted (0) A tools/sdparted (655) A tools/tune2fs (0) A tools/undofixmarket.sh (5) M widgets/appwidget.cpp (496) M widgets/appwidget.h (28) M widgets/appwidget.ui (18) M widgets/contactwidget.h (2) A widgets/cwmwidget.cpp (1815) A widgets/cwmwidget.h (159) A widgets/cwmwidget.ui (1791) M widgets/filewidget.cpp (441) M widgets/filewidget.h (6) M widgets/filewidget.ui (9) M widgets/messagewidget.cpp (4) M widgets/phoneinfowidget.cpp (6) M widgets/phoneinfowidget.ui (2) M widgets/recoverywidget.cpp (16) A widgets/sdfiles.h (22) A widgets/sdfiles.ui (21) M widgets/settingswidget.cpp (116) M widgets/settingswidget.h (16) M widgets/settingswidget.ui (90) M widgets/shellwidget.cpp (1106) M widgets/shellwidget.h (5) M zasoby.qrc (15)

-- Patch Links --

https://github.com/triochi/QtAdb/pull/7.patch https://github.com/triochi/QtAdb/pull/7.diff

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4662708

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4662821

7ymekk commented 12 years ago

no problem ;) we very like Your changes but such details as deleting languages and messages panel, force us to read Your entire code before merging but for now I can say that most(or even all) of Your modifications will be merged but we have to be 100% sure that there is no more scratches like the said details. You can do whatever You want with this source code until it is compatible with Apache license;)

2012/3/23 nijel8 reply@reply.github.com:

No problem... Take your time. I reverted all features including the language files in my fork so all is good. I merge to my fork. I don't touch your master branch or any other branch that is not mine ever. I respect your work and other people's work. It's your call if you want to merge my code or not to your master. The only think I want from you guys is to let me publish my modified QtAdb for testing with the clear statement that it is not officially supported by you and to not bother you with any questions or issues. How's that sounds?

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4667410

nijel8 commented 12 years ago

I'm gonna delete my fork and make a new one from your master and merge my code again so you have a clear patch.

OK. Done.

7ymekk commented 12 years ago

Hey,

I've readed Your source code and it has a load of great solutions but I'm concern about some things(I will refer to this diff: https://github.com/triochi/QtAdb/commit/db2fcb5d7439914972614e2697bd07b1c8927de7):

You removed all "busybox" usages with 'ls' and other commands. unfortunately on the start of this project it appeard that 'ls' is not unified on all phones so it worked well on HTC Magic but not on all of HTC phones(not mention the other manufacturers). it has to use busybox...We could always detect if phone has busybox and warn user that it is recommended to have busybox installed
removed translations ...and thats it:)

Me and Triochi very like Your changes so I think that with some improvements (like restore busybox) we could merge Your ENTIRE source code:)

We will be in touch

Best regards Jakub

2012/3/23 nijel8 reply@reply.github.com:

I'm gonna delete my fork and make a new one from your master and merge my code again so you have a clear patch.

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4667691

7ymekk commented 12 years ago

ps. one important thing...have You tested Your version on some Linux?\ ps2. as I mentioned...Your version doesn't work for me.

empty files list
empty applications list
empty system applications list
empty partitions info in phone info panel I think that these all bugs are caused by busybox removal;P

nijel8 commented 12 years ago

I readded busybox to all adb shell commands that are part of busybox. What do you mean by "- removed translations"? do you mean tr() in messages?

nijel8 commented 12 years ago

I can't test on linux. Don't have linux box.

-----Original Message----- From: 7ymekk Sent: Saturday, March 24, 2012 2:38 PM To: nijel8 Subject: Re: [QtAdb] Removed features reverted... (#7)

ps. one important thing...have You tested Your version on some Linux?

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4675570

nijel8 commented 12 years ago

Added translations back. I figured it out what you meant. One question - translations are pointing to lines in the cpp files. Does this mean changing source code (moving lines) screws up the translations?

7ymekk commented 12 years ago

it shouldn't screw up translations but You could also try option update in QtLinguist (Tools->External->Linguist->Update translations)

7ymekk commented 12 years ago

after 'busybox' readded it works for me now and translations are all fine ;) it looks very promising but I don't understand why You've replaced in ThreadDelegate.qml some of '==' to '==='. it broke messages panel!

I will test it for some time and I think we will merge it very soon

ps. You can remove QtADB.pro.user from repo. it is autogenerated user dependent file, which shouldn't be in repo;)

nijel8 commented 12 years ago

I don't remember touching anything regarding messaging. I might have done it accidentally probably. Messaging never worked for me, but I'm not interested in that functionality at all. I'll copy the original file back and I'll remove QtADB.pro.user.

triochi commented 12 years ago

I can add that in the work branch, there is a replacement for the "ls" command which uses socket connection to adb server to execute it's ls command which has the same output format on any android devices. For the other commands, maybe there is no problem to call without busybox - there is no formatted output that we should parse. (Correct me if I'm wrong)

Regards Dimitar

2012/3/24 7ymekk < reply@reply.github.com

Hey,

I've readed Your source code and it has a load of great solutions but I'm concern about some things(I will refer to this diff:

https://github.com/triochi/QtAdb/commit/db2fcb5d7439914972614e2697bd07b1c8927de7 ):

You removed all "busybox" usages with 'ls' and other commands. unfortunately on the start of this project it appeard that 'ls' is not unified on all phones so it worked well on HTC Magic but not on all of HTC phones(not mention the other manufacturers). it has to use busybox...We could always detect if phone has busybox and warn user that it is recommended to have busybox installed

removed translations ...and thats it:)

Me and Triochi very like Your changes so I think that with some improvements (like restore busybox) we could merge Your ENTIRE source code:)

We will be in touch

Best regards Jakub

2012/3/23 nijel8 reply@reply.github.com:

I'm gonna delete my fork and make a new one from your master and merge my code again so you have a clear patch.

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4667691

Reply to this email directly or view it on GitHub: https://github.com/triochi/QtAdb/pull/7#issuecomment-4675519

7ymekk commented 12 years ago

I forgot that Mozarcik sent You the socket solution;) hmm I think that We could replace getting-fileList-mechanism and We could test QtADB without busybox. it would be nice addendum for the new version

Regards Jakub