Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI SPICE #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ remoteClientLib/.cxx/
*/libs/*/libsqlcipher.so
remoteClientLib/src/main/assets/fontconfig/
remoteClientLib/src/main/assets/ssl/
remoteClientLib/src/main/jniLibs/**/**.so
bVNC/debug/
bVNC/gst-build-armeabi-v7a/
bVNC/gst-build-x86/
Expand All @@ -37,6 +38,7 @@ bVNC/src/main/assets/
bVNC/src2/main/assets/fontconfig/
bVNC/src2/main/assets/ssl/
CustomVnc-app/src/main/AndroidManifest.xml.bakautocustom
remote-desktop-clients-libs-*.tar.gz

### AndroidStudio ###

Expand Down Expand Up @@ -120,6 +122,20 @@ obj/
.idea/codeStyles
.idea/jarRepositories.xml

# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml

Opaque/.idea/libraries/
Opaque/.idea/workspace.xml
Opaque/.idea/tasks.xml
Expand Down
47 changes: 0 additions & 47 deletions .idea/assetWizardSettings.xml

This file was deleted.

40 changes: 0 additions & 40 deletions .idea/gradle.xml

This file was deleted.

1 change: 1 addition & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aSPICE-app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<application
android:banner="@drawable/banner_aspice"
android:icon="@drawable/icon_aspice"
android:icon="@drawable/icon_ci"
android:label="@string/aspice_app_name"
android:allowBackup="false"
android:theme="@style/AppTheme"
Expand Down
Binary file added bVNC/src/main/res/drawable/icon_ci.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion bVNC/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Todos los métodos de entrada:
<string name="arrow_right">Flecha derecha</string>
<string name="arrow_up">Flecha hacia arriba</string>

<string name="aspice_app_name">aSPICE Pro</string>
<string name="aspice_app_name">CI SPICE</string>

<string name="auto">Auto</string>
<string name="auto_x_cancel">Cancelar</string>
Expand Down
2 changes: 1 addition & 1 deletion bVNC/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<string name="arrow_left">左矢印</string>
<string name="arrow_right">右矢印</string>
<string name="arrow_up">上矢印</string>
<string name="aspice_app_name">aSPICE Pro</string>
<string name="aspice_app_name">CI SPICE</string>
<string name="auto">自動</string>
<string name="auto_x_cancel">キャンセル</string>
<string name="auto_x_caption">bVNCは、既存のものを自動検索し、Linux/UNIXシステム上で、Xセッションを新規作成します(NXと類似)。検索には x11vncを、セッション作成には Xvfb, Xvnc, Xdummyが必要です。接続にお困りの場合、AutoX詳細設定にて、特定のリモートセッションタイプを選択してください。</string>
Expand Down
2 changes: 1 addition & 1 deletion bVNC/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<string name="arrow_left">왼쪽 화살표</string>
<string name="arrow_right">오른쪽 화살표</string>
<string name="arrow_up">위쪽 화살표</string>
<string name="aspice_app_name">aSPICE Pro</string>
<string name="aspice_app_name">CI SPICE</string>
<string name="auto">자동</string>
<string name="auto_x_cancel">취소</string>
<string name="auto_x_caption">bVNC은 기존내용을 자동 검색하고 Linux/UNIX 시스템상에서 X세션을 신규 작성합니다(NX와 유사).검색은 x11vnc세션 작성은 XvfbXvncXdummy가 필요합니다.연결에 문제가있을 경우 AutoX 상세 설정에서 특정 리모트 세션 타입을 선택하십시오.</string>
Expand Down
2 changes: 1 addition & 1 deletion bVNC/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<string name="arrow_right">Strzałka w prawo</string>
<string name="arrow_up">Strzałka w górę</string>

<string name="aspice_app_name">aSPICE Pro</string>
<string name="aspice_app_name">CI SPICE</string>

<string name="auto">Automatycznie</string>
<string name="auto_x_cancel">Anuluj</string>
Expand Down
2 changes: 1 addition & 1 deletion bVNC/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ All Input Methods:
<string name="arrow_right">Стрелка вправо</string>
<string name="arrow_up">Стрелка вверх</string>

<string name="aspice_app_name">aSPICE Pro</string>
<string name="aspice_app_name">CI SPICE</string>

<string name="auto">Автоматически</string>
<string name="auto_x_cancel">Отмена</string>
Expand Down
2 changes: 1 addition & 1 deletion bVNC/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<string name="arrow_left">向左箭头</string>
<string name="arrow_right">向右箭头</string>
<string name="arrow_up">向上箭头</string>
<string name="aspice_app_name">aSPICE Pro</string>
<string name="aspice_app_name">CI SPICE</string>
<string name="auto">自动</string>
<string name="auto_x_cancel">取消</string>
<string name="auto_x_caption">bVNC在Linux/UNIX系统(类似于NX)上自动搜索现有的并创建新的X会话。搜索需要x11vnc,创建会话需要Xvfb、Xvnc或Xdummy。如果连接有问题,请尝试在AutoX高级设置中选择特定的远程会话类型。</string>
Expand Down
2 changes: 1 addition & 1 deletion bVNC/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<string name="arrow_left">向左箭頭</string>
<string name="arrow_right">向右箭頭</string>
<string name="arrow_up">向上箭頭</string>
<string name="aspice_app_name">aSPICE Pro</string>
<string name="aspice_app_name">CI SPICE</string>
<string name="auto">自動</string>
<string name="auto_x_cancel">取消</string>
<string name="auto_x_caption">bVNC在Linux/UNIX系統(類似於NX)上自動搜索現有的並創建新的X會話。搜索需要x11vnc,創建會話需要Xvfb、Xvnc或Xdummy。如果連接有問題,請嘗試在AutoX高級設置中選擇特定的遠端會話類型。</string>
Expand Down
2 changes: 1 addition & 1 deletion bVNC/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ All Input Methods:
<string name="arrow_right">Right Arrow</string>
<string name="arrow_up">Up Arrow</string>

<string name="aspice_app_name">aSPICE Pro</string>
<string name="aspice_app_name">CI SPICE</string>

<string name="auto">Auto</string>
<string name="auto_x_cancel">Cancel</string>
Expand Down