Skip to content

Commit

Permalink
Attached actions to Photos/Videos/Music browser.
Browse files Browse the repository at this point in the history
  • Loading branch information
@vaibhavpandeyvpz
vaibhavpandeyvpz committed Nov 6, 2014
1 parent afa3158 commit c509576
Show file tree
Hide file tree
Showing 16 changed files with 593 additions and 45 deletions.
Binary file added resource/icon/film.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
220 changes: 212 additions & 8 deletions resource/language/en.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,74 @@
<source>header_time</source>
<translation>Time</translation>
</message>
<message>
<source>label_copy</source>
<translation>Enter destination path to copy files to</translation>
</message>
<message>
<source>label_move</source>
<translation>Enter destination path to move files to</translation>
</message>
<message>
<source>label_rename</source>
<translation>Enter new file name</translation>
</message>
<message>
<source>message_copy</source>
<translation>Do you really wish to copy %1 file(s) to %2?</translation>
</message>
<message>
<source>message_copy_failed</source>
<translation>Successfully copied: %1, failed: %2</translation>
</message>
<message>
<source>message_move</source>
<translation>Do you really wish to move %1 file(s) to %2?</translation>
</message>
<message>
<source>message_move_failed</source>
<translation>Failed to move all or few of selected file(s) to %1</translation>
</message>
<message>
<source>message_pull_failed</source>
<translation>Successfully pulled: %1, failed: %2</translation>
</message>
<message>
<source>message_remove</source>
<translation>Do you really wish to remove %1 file(s)/folder(s)?</translation>
</message>
<message>
<source>message_remove_failed</source>
<translation>Successfully removed: %1, failed: %2</translation>
</message>
<message>
<source>message_rename_failed</source>
<translation>Successfully renamed: %1, failed: %2</translation>
</message>
<message>
<source>title_browse</source>
<translation>Select Folder</translation>
</message>
<message>
<source>title_copy</source>
<translation>Copy Song(s)</translation>
</message>
<message>
<source>title_failure</source>
<translation>Failure</translation>
</message>
<message>
<source>title_move</source>
<translation>Move Song(s)</translation>
</message>
<message>
<source>title_remove</source>
<translation>Remove</translation>
</message>
<message>
<source>title_rename</source>
<translation>Rename Song(s)</translation>
</message>
</context>
<context>
<name>outline</name>
Expand Down Expand Up @@ -874,6 +942,74 @@
<source>header_time</source>
<translation>Time</translation>
</message>
<message>
<source>label_copy</source>
<translation>Enter destination path to copy files to</translation>
</message>
<message>
<source>label_move</source>
<translation>Enter destination path to move files to</translation>
</message>
<message>
<source>label_rename</source>
<translation>Enter new file name</translation>
</message>
<message>
<source>message_copy</source>
<translation>Do you really wish to copy %1 file(s) to %2?</translation>
</message>
<message>
<source>message_copy_failed</source>
<translation>Successfully copied: %1, failed: %2</translation>
</message>
<message>
<source>message_move</source>
<translation>Do you really wish to move %1 file(s) to %2?</translation>
</message>
<message>
<source>message_move_failed</source>
<translation>Failed to move all or few of selected file(s) to %1</translation>
</message>
<message>
<source>message_pull_failed</source>
<translation>Successfully pulled: %1, failed: %2</translation>
</message>
<message>
<source>message_remove</source>
<translation>Do you really wish to remove %1 file(s)/folder(s)?</translation>
</message>
<message>
<source>message_remove_failed</source>
<translation>Successfully removed: %1, failed: %2</translation>
</message>
<message>
<source>message_rename_failed</source>
<translation>Successfully renamed: %1, failed: %2</translation>
</message>
<message>
<source>title_browse</source>
<translation>Select Folder</translation>
</message>
<message>
<source>title_copy</source>
<translation>Copy Photo(s)</translation>
</message>
<message>
<source>title_failure</source>
<translation>Failure</translation>
</message>
<message>
<source>title_move</source>
<translation>Move Photo(s)</translation>
</message>
<message>
<source>title_remove</source>
<translation>Remove</translation>
</message>
<message>
<source>title_rename</source>
<translation>Rename Photo(s)</translation>
</message>
</context>
<context>
<name>projects</name>
Expand Down Expand Up @@ -1115,14 +1251,14 @@
<source>message_push_failed</source>
<translation>Successfully pushed: %1, failed: %2</translation>
</message>
<message>
<source>message_remove_failed</source>
<translation>Successfully removed: %1, failed: %2</translation>
</message>
<message>
<source>message_remove</source>
<translation>Do you really wish to remove %1 file(s)/folder(s)?</translation>
</message>
<message>
<source>message_remove_failed</source>
<translation>Successfully removed: %1, failed: %2</translation>
</message>
<message>
<source>message_rename_failed</source>
<translation>Successfully renamed: %1, failed: %2</translation>
Expand All @@ -1139,6 +1275,10 @@
<source>title_create</source>
<translation>Create New Folder</translation>
</message>
<message>
<source>title_failure</source>
<translation>Failure</translation>
</message>
<message>
<source>title_move</source>
<translation>Move File(s)/Folder(s)</translation>
Expand All @@ -1159,10 +1299,6 @@
<source>title_select</source>
<translation>Select Files</translation>
</message>
<message>
<source>title_failure</source>
<translation>Failure</translation>
</message>
</context>
<context>
<name>toolbar</name>
Expand Down Expand Up @@ -1248,6 +1384,74 @@
<source>header_time</source>
<translation>Time</translation>
</message>
<message>
<source>label_copy</source>
<translation>Enter destination path to copy files to</translation>
</message>
<message>
<source>label_move</source>
<translation>Enter destination path to move files to</translation>
</message>
<message>
<source>label_rename</source>
<translation>Enter new file name</translation>
</message>
<message>
<source>message_copy</source>
<translation>Do you really wish to copy %1 file(s) to %2?</translation>
</message>
<message>
<source>message_copy_failed</source>
<translation>Successfully copied: %1, failed: %2</translation>
</message>
<message>
<source>message_move</source>
<translation>Do you really wish to move %1 file(s) to %2?</translation>
</message>
<message>
<source>message_move_failed</source>
<translation>Failed to move all or few of selected file(s) to %1</translation>
</message>
<message>
<source>message_pull_failed</source>
<translation>Successfully pulled: %1, failed: %2</translation>
</message>
<message>
<source>message_remove</source>
<translation>Do you really wish to remove %1 file(s)/folder(s)?</translation>
</message>
<message>
<source>message_remove_failed</source>
<translation>Successfully removed: %1, failed: %2</translation>
</message>
<message>
<source>message_rename_failed</source>
<translation>Successfully renamed: %1, failed: %2</translation>
</message>
<message>
<source>title_browse</source>
<translation>Select Folder</translation>
</message>
<message>
<source>title_copy</source>
<translation>Copy Video(s)</translation>
</message>
<message>
<source>title_failure</source>
<translation>Failure</translation>
</message>
<message>
<source>title_move</source>
<translation>Move Video(s)</translation>
</message>
<message>
<source>title_remove</source>
<translation>Remove</translation>
</message>
<message>
<source>title_rename</source>
<translation>Rename Video(s)</translation>
</message>
</context>
<context>
<name>viewer</name>
Expand Down
1 change: 1 addition & 0 deletions resource/resources.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,6 @@
<file>icon/lock_unlock.png</file>
<file>icon/lock_warning.png</file>
<file>icon/music.png</file>
<file>icon/film.png</file>
</qresource>
</RCC>
2 changes: 2 additions & 0 deletions source/components/vpz/apkstudio/components/applications.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ Applications::Applications(const QString &device, QWidget *parent) :
setSortingEnabled(true);
sortByColumn(0, Qt::AscendingOrder);
// -- //
new QShortcut(QKeySequence(Qt::Key_Return), this, SLOT(onDetails()));
new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_I), this, SLOT(onInstall()));
new QShortcut(QKeySequence(Qt::Key_F5), this, SLOT(onRefresh()));
new QShortcut(QKeySequence(Qt::Key_Delete), this, SLOT(onUninstall()));
}

Expand Down
15 changes: 11 additions & 4 deletions source/components/vpz/apkstudio/components/music.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ Music::Music(const QString &device, QWidget *parent) :
setSelectionMode(QAbstractItemView::ExtendedSelection);
setSortingEnabled(true);
sortByColumn(3, Qt::DescendingOrder);
// -- //
new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_C), this, SLOT(onCopy()));
new QShortcut(QKeySequence(Qt::Key_Return), this, SLOT(onDetails()));
new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_X), this, SLOT(onMove()));
new QShortcut(QKeySequence(Qt::Key_F5), this, SLOT(onRefresh()));
new QShortcut(QKeySequence(Qt::Key_F2), this, SLOT(onRename()));
new QShortcut(QKeySequence(Qt::Key_Delete), this, SLOT(onRemove()));
}

void Music::onAction(QAction *action)
Expand Down Expand Up @@ -73,7 +80,7 @@ void Music::onCopy()
failed++;
}
if (failed >= 1)
QMessageBox::critical(this, translate("title_failure"), translate("message_copy_failed").arg(failed, successful), QMessageBox::Close);
QMessageBox::critical(this, translate("title_failure"), translate("message_copy_failed").arg(QString::number(successful), QString::number(failed)), QMessageBox::Close);
}

void Music::onDetails()
Expand Down Expand Up @@ -125,7 +132,7 @@ void Music::onPull()
failed++;
}
if (failed >= 1)
QMessageBox::critical(this, translate("title_failure"), translate("message_pull_failed").arg(successful, failed), QMessageBox::Close);
QMessageBox::critical(this, translate("title_failure"), translate("message_pull_failed").arg(QString::number(successful), QString::number(failed)), QMessageBox::Close);
}

void Music::onRefresh()
Expand Down Expand Up @@ -169,7 +176,7 @@ void Music::onRemove()
failed++;
}
if (failed >= 1)
QMessageBox::critical(this, translate("title_failure"), translate("message_remove_failed").arg(successful, failed), QMessageBox::Close);
QMessageBox::critical(this, translate("title_failure"), translate("message_remove_failed").arg(QString::number(successful), QString::number(failed)), QMessageBox::Close);
}

void Music::onRename()
Expand Down Expand Up @@ -208,7 +215,7 @@ void Music::onRename()
failed++;
}
if (failed >= 1)
QMessageBox::critical(this, translate("title_failure"), translate("message_rename_failed").arg(successful, failed), QMessageBox::Close);
QMessageBox::critical(this, translate("title_failure"), translate("message_rename_failed").arg(QString::number(successful), QString::number(failed)), QMessageBox::Close);
}

QVector<Resources::Music> Music::selected()
Expand Down
1 change: 1 addition & 0 deletions source/components/vpz/apkstudio/components/music.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <QFileDialog>
#include <QInputDialog>
#include <QMessageBox>
#include <QShortcut>
#include <QTreeWidget>
#include "helpers/adb.hpp"
#include "helpers/format.hpp"
Expand Down
2 changes: 2 additions & 0 deletions source/components/vpz/apkstudio/components/partitions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Partitions::Partitions(const QString &device, QWidget *parent) :
setSelectionMode(QAbstractItemView::SingleSelection);
setSortingEnabled(true);
sortByColumn(3, Qt::DescendingOrder);
// -- //
new QShortcut(QKeySequence(Qt::Key_F5), this, SLOT(onRefresh()));
}

void Partitions::onAction(QAction *action)
Expand Down
1 change: 1 addition & 0 deletions source/components/vpz/apkstudio/components/partitions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <QAction>
#include <QMessageBox>
#include <QShortcut>
#include <QTreeWidget>
#include "helpers/adb.hpp"
#include "helpers/text.hpp"
Expand Down
Loading

0 comments on commit c509576

Please sign in to comment.