Skip to content

Commit

Permalink
Merge branch 'update' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
callFEELD committed Jan 25, 2021
2 parents f923b13 + 5e55a21 commit 7e9079c
Show file tree
Hide file tree
Showing 12 changed files with 77 additions and 2,987 deletions.
26 changes: 17 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,52 @@
# Threema Desktop

[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8444aafd57b24f00aa54200d534ae8a6)](https://www.codacy.com/manual/callfeeld/Threema-Desktop?utm_source=github.com&utm_medium=referral&utm_content=callFEELD/Threema-Desktop&utm_campaign=Badge_Grade)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8444aafd57b24f00aa54200d534ae8a6)](https://www.codacy.com/manual/callfeeld/Threema-Desktop?utm_source=github.com&utm_medium=referral&utm_content=callFEELD/Threema-Desktop&utm_campaign=Badge_Grade)
![Build](https://github.com/callFEELD/Threema-Desktop/workflows/Build/badge.svg)

A desktop application for [Threema Web](https://web.threema.ch/) similar to Whatsapp or Telegram.

## Supported Platforms

![Windows](https://cdn0.iconfinder.com/data/icons/logos-brands-2/48/logo_brand_brands_logos_microsoft_windows-48.png)
![Mac OS](https://cdn0.iconfinder.com/data/icons/logos-brands-2/48/logo_brand_brands_logos_apple_ios-48.png)
![Linux](https://cdn0.iconfinder.com/data/icons/logos-brands-2/48/logo_brand_brands_logos_linux-48.png)

## Features
+ **Notifications** | Messages will be displayed as normal operating system notifications
+ **Taskbar Tray** | Closing the application results into minizing Threema Desktop into a Taskbar Tray icon (Just like other apps i.e. discord, skype, telegram desktop)
+ **Full screen** | The applications is [changing some website styles](https://github.com/callFEELD/Threema-Desktop/blob/master/assets/css/override.css) in order to display only the important parts, no more unnecessary background images.
+ **Save images or files** | Files and images can be locally stored
+ **Links will open in the default webbrowser**

- **Notifications** | Messages will be displayed as normal operating system notifications
- **Taskbar Tray** | Closing the application results into minizing Threema Desktop into a Taskbar Tray icon (Just like other apps i.e. discord, skype, telegram desktop)
- **Full screen** | The applications is [changing some website styles](https://github.com/callFEELD/Threema-Desktop/blob/master/assets/css/override.css) in order to display only the important parts, no more unnecessary background images.
- **Save images or files** | Files and images can be locally stored
- **Links will open in the default webbrowser**

![ThreemaDekstopApplication](https://raw.githubusercontent.com/callFEELD/Threema-Desktop/master/docs/img/Threema-Desktop.jpg)

## Installation

### ![Windows](https://cdn0.iconfinder.com/data/icons/logos-brands-2/48/logo_brand_brands_logos_microsoft_windows-48.png)
+ [Windows Installer](https://github.com/callFEELD/Threema-Desktop/releases)
+ [Portable Edition](https://github.com/callFEELD/Threema-Desktop/releases)

- [Windows Installer](https://github.com/callFEELD/Threema-Desktop/releases)
- [Portable Edition](https://github.com/callFEELD/Threema-Desktop/releases)

### ![Mac OS](https://cdn0.iconfinder.com/data/icons/logos-brands-2/48/logo_brand_brands_logos_apple_ios-48.png) ![Linux](https://cdn0.iconfinder.com/data/icons/logos-brands-2/48/logo_brand_brands_logos_linux-48.png)

Sorry but you have to build it yourself.

Clone the repository

```bash
git clone https://github.com/callFEELD/Threema-Desktop/
```

Install the dependencies

```bash
yarn install
```

Build it for your platform
```

```bash
yarn dist
```

Expand Down
Binary file added Threema.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions assets/css/override.css
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#main-wrapper {
width: 100% !important;
height: 100% !important;
max-width: none !important;
max-height: none !important;
#main-wrapper {
width: 100% !important;
height: 100% !important;
max-width: none !important;
max-height: none !important;
}

#main-wrapper #main {
border-radius: 0px !important;
border-radius: 0 !important;
}

#main-wrapper:not(.wide) #main {
min-height: none !important;
min-height: none !important;
}

#main-wrapper header {
display: none !important;
display: none !important;
}

#main-wrapper footer {
display: none !important;
}
display: none !important;
}
Binary file added assets/img/threema.ico
Binary file not shown.
Binary file removed build/threema.ico
Binary file not shown.
3 changes: 1 addition & 2 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @description The main application will run the electron window and
* connect the various files and functions.
* @author callFEELD
* @version 0.1
*/


Expand Down Expand Up @@ -38,7 +37,7 @@ if (!gotTheLock) {
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.
app.on("ready", createWindow);
app.whenReady().then(createWindow);


// Quit when all windows are closed.
Expand Down
Loading

0 comments on commit 7e9079c

Please sign in to comment.