commit 117632e38fbde50322fd3339c93c7f121f3a2cf9 parent aa0897f24a25269e7bc4db7caf952c8d35169678 Author: MTRNord <mtrnord1@gmail.com> Date: Wed, 2 May 2018 19:30:04 +0200 Fix merge conflicts before merge Diffstat:
30 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/Gopkg.lock b/Gopkg.lock @@ -28,6 +28,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "9eae52af7d8c49e9a27a1863ba05582acb167fd5a5ce5bf23b6eb9288a20d0c2" + inputs-digest = "c22db96d1e74b32e9427a6f762b2be5797dcc8426407dc4769795fe6ca7296be" solver-name = "gps-cdcl" solver-version = 1 diff --git a/pkg/mainThreadHelper.go b/pkg/mainThreadHelper.go @@ -1,38 +0,0 @@ -// Copyright © 2018 MTRNord <info@nordgedanken.de> -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package pkg - -// Main runs the main SDL service loop. -// The binary's main.main must call sdl.Main() to run this loop. -// Main does not return. If the binary needs to do other work, it -// must do it in separate goroutines. -func Main() { - for f := range mainfunc { - f() - } -} - -// queue of work to run in main thread. -var mainfunc = make(chan func()) - -// Do runs f on the main thread. -func Do(f func()) { - done := make(chan bool, 1) - mainfunc <- func() { - f() - done <- true - } - <-done -} diff --git a/pkg/qml/icons/README.md b/qml/icons/README.md diff --git a/pkg/qml/icons/ic_add_black_48px.svg b/qml/icons/ic_add_black_48px.svg diff --git a/pkg/qml/icons/ic_add_white_48px.svg b/qml/icons/ic_add_white_48px.svg diff --git a/pkg/qml/icons/ic_arrow_drop_down_black_48px.svg b/qml/icons/ic_arrow_drop_down_black_48px.svg diff --git a/pkg/qml/icons/ic_arrow_drop_down_circle_black_48px.svg b/qml/icons/ic_arrow_drop_down_circle_black_48px.svg diff --git a/pkg/qml/icons/ic_menu_black_48px.svg b/qml/icons/ic_menu_black_48px.svg diff --git a/pkg/qml/icons/ic_menu_white_48px.svg b/qml/icons/ic_menu_white_48px.svg diff --git a/pkg/qml/icons/ic_person_black_48px.svg b/qml/icons/ic_person_black_48px.svg diff --git a/pkg/qml/icons/ic_person_white_48px.svg b/qml/icons/ic_person_white_48px.svg diff --git a/pkg/qml/icons/ic_phone_black_48px.svg b/qml/icons/ic_phone_black_48px.svg diff --git a/pkg/qml/icons/ic_phone_white_48px.svg b/qml/icons/ic_phone_white_48px.svg diff --git a/pkg/qml/icons/ic_power_settings_new_black_48px.svg b/qml/icons/ic_power_settings_new_black_48px.svg diff --git a/pkg/qml/icons/ic_power_settings_new_white_48px.svg b/qml/icons/ic_power_settings_new_white_48px.svg diff --git a/pkg/qml/icons/ic_send_black_48px.svg b/qml/icons/ic_send_black_48px.svg diff --git a/pkg/qml/icons/ic_settings_black_48px.svg b/qml/icons/ic_settings_black_48px.svg diff --git a/pkg/qml/icons/ic_settings_white_48px.svg b/qml/icons/ic_settings_white_48px.svg diff --git a/pkg/qml/icons/ic_video_call_black_48px.svg b/qml/icons/ic_video_call_black_48px.svg diff --git a/pkg/qml/icons/ic_video_call_white_48px.svg b/qml/icons/ic_video_call_white_48px.svg diff --git a/pkg/qml/icons/sign-in.svg b/qml/icons/sign-in.svg diff --git a/pkg/qml/icons/sign-out.svg b/qml/icons/sign-out.svg diff --git a/pkg/qml/langs/morpheus_en.ts b/qml/langs/morpheus_en.ts diff --git a/pkg/qml/resources/logos/MorpheusBig.png b/qml/resources/logos/MorpheusBig.png Binary files differ. diff --git a/pkg/qml/ui/chat.ui b/qml/ui/chat.ui diff --git a/pkg/qml/ui/login.ui b/qml/ui/login.ui diff --git a/pkg/qml/ui/message.ui b/qml/ui/message.ui diff --git a/pkg/qml/ui/ownmessage.ui b/qml/ui/ownmessage.ui diff --git a/pkg/qml/ui/register.ui b/qml/ui/register.ui diff --git a/pkg/qml/ui/room.ui b/qml/ui/room.ui
