Merge pull request #1297 from a1346054/fixes
Simple maintenance improvements
This commit is contained in:
Povilas Kanapickas
GitHub
commit
dd8c2a1a38
|
|
@ -18,7 +18,7 @@ body:
|
|||
id: version
|
||||
attributes:
|
||||
label: Version
|
||||
description: What version of Barrier are you runnning?
|
||||
description: What version of Barrier are you running?
|
||||
options:
|
||||
- v2.0.0-RC1
|
||||
- v2.0.0-RC2
|
||||
|
|
|
|||
59
LICENSE
59
LICENSE
|
|
@ -286,3 +286,62 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
|
|
|
|||
|
|
@ -107,7 +107,8 @@ A: Start the binary with the argument `--config <path_to_saved_configuration>`
|
|||
|
||||
Q: After loading my configuration on the client the field 'Server IP' is still empty!
|
||||
|
||||
A: Edit your configuration to include the servers ip adress manually with
|
||||
A: Edit your configuration to include the server's ip address manually with
|
||||
|
||||
(...)
|
||||
section: options
|
||||
serverhostname=<AAA.BBB.CCC.DDD>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ if exist bin\Debug (
|
|||
mkdir bin\Release\platforms
|
||||
copy %B_QT_FULLPATH%\plugins\platforms\qwindows.dll bin\Release\platforms\ > NUL
|
||||
) else (
|
||||
echo Remember to copy supporting binaries and confiuration files!
|
||||
echo Remember to copy supporting binaries and configuration files!
|
||||
)
|
||||
|
||||
echo Build completed successfully
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#!/bin/sh
|
||||
cd "$(dirname $0)" || exit 1
|
||||
cd "$(dirname "$0")" || exit 1
|
||||
# some environments have cmake v2 as 'cmake' and v3 as 'cmake3'
|
||||
# check for cmake3 first then fallback to just cmake
|
||||
B_CMAKE=`type cmake3 2>/dev/null`
|
||||
if [ $? -eq 0 ]; then
|
||||
B_CMAKE=`echo $B_CMAKE | cut -d' ' -f3`
|
||||
B_CMAKE=`echo "$B_CMAKE" | cut -d' ' -f3`
|
||||
else
|
||||
B_CMAKE=cmake
|
||||
fi
|
||||
|
|
@ -26,7 +26,7 @@ B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE $B_CMAKE_FLAGS"
|
|||
rm -rf build
|
||||
mkdir build || exit 1
|
||||
cd build || exit 1
|
||||
echo Starting Barrier $B_BUILD_TYPE build...
|
||||
echo "Starting Barrier $B_BUILD_TYPE build..."
|
||||
$B_CMAKE $B_CMAKE_FLAGS .. || exit 1
|
||||
make || exit 1
|
||||
echo "Build completed successfully"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Use the same verbose variable as CMake
|
||||
[ "$VERBOSE" == "1" ] && set -x
|
||||
[ "$VERBOSE" = "1" ] && set -x
|
||||
|
||||
# Exit on unset variables or pipe errors
|
||||
set -uo pipefail
|
||||
|
|
@ -14,10 +14,10 @@ B_BARRIERC="Barrier.app/Contents/MacOS/barrierc"
|
|||
B_BARRIERS="Barrier.app/Contents/MacOS/barriers"
|
||||
|
||||
# Colorized output
|
||||
function info() { tput bold; echo "$@" ; tput sgr0 ;}
|
||||
function error() { tput bold; tput setaf 1; echo "$@"; tput sgr0 ; }
|
||||
function success() { tput bold; tput setaf 2; echo "$@"; tput sgr0 ; }
|
||||
function warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
|
||||
info() { tput bold; echo "$@"; tput sgr0 ; }
|
||||
error() { tput bold; tput setaf 1; echo "$@"; tput sgr0 ; }
|
||||
success() { tput bold; tput setaf 2; echo "$@"; tput sgr0 ; }
|
||||
warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
|
||||
|
||||
info "Checking for bundle contents"
|
||||
if [ ! -d "Barrier.app/Contents" ]; then
|
||||
|
|
@ -40,7 +40,7 @@ if which -s port ; then
|
|||
info "MacPorts found, searching for macdeployqt"
|
||||
DEPLOYQT="$(port contents qt5-qttools | grep --only --max-count 1 '/.*macdeployqt')"
|
||||
if [ ! -x "$DEPLOYQT" ]; then
|
||||
error Please install package qt5-qttools
|
||||
error "Please install package qt5-qttools"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
@ -50,13 +50,13 @@ if which -s brew ; then
|
|||
info "Homebrew found, searching for macdeployqt"
|
||||
DEPLOYQT="$(brew list qt@5 | grep --only '/.*macdeployqt' | head -1)"
|
||||
if [ ! -x "$DEPLOYQT" ]; then
|
||||
error Please install package qt
|
||||
error "Please install package qt"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Use macdeployqt to include libraries and create dmg
|
||||
if [ "$B_BUILDTYPE" == "Release" ]; then
|
||||
if [ "$B_BUILDTYPE" = "Release" ]; then
|
||||
info "Building Release disk image (dmg)"
|
||||
"$DEPLOYQT" Barrier.app -dmg \
|
||||
-executable="$B_BARRIERC" \
|
||||
|
|
|
|||
|
|
@ -1,30 +1,30 @@
|
|||
#!/bin/sh
|
||||
|
||||
# add warning for users running manually
|
||||
function warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
|
||||
warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
|
||||
warn "The scripts build_installer.sh and reref_dylibs.sh have been deprecated."
|
||||
warn "Please use build_dist.sh instead to deploy using macdeployqt"
|
||||
|
||||
# change this to rename the installer package
|
||||
B_DMG="Barrier-@BARRIER_VERSION@.dmg"
|
||||
|
||||
cd "$( dirname '$0' )"
|
||||
cd "$( dirname "$0" )"
|
||||
OWNDIR="$( pwd )"
|
||||
|
||||
B_REREF_SCRIPT="$OWNDIR/reref_dylibs.sh"
|
||||
if [ ! -x $B_REREF_SCRIPT ]; then
|
||||
echo Missing script: $B_REREF_SCRIPT
|
||||
if [ ! -x "$B_REREF_SCRIPT" ]; then
|
||||
echo "Missing script: $B_REREF_SCRIPT"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# remove any old copies so there's no confusion about whether this
|
||||
# process completes successfully or not
|
||||
rm -rf temp.dmg $B_DMG
|
||||
rm -rf temp.dmg "$B_DMG"
|
||||
|
||||
cd Barrier.app/Contents 2>/dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
echo Please make sure that the build completed successfully
|
||||
echo before trying to create the installer.
|
||||
echo "Please make sure that the build completed successfully"
|
||||
echo "before trying to create the installer."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ hdiutil create -size 64m -fs HFS+ -volname "Barrier" temp.dmg || exit 1
|
|||
hdiutil attach temp.dmg -mountpoint mnt || exit 1
|
||||
cp -r Barrier.app mnt/ || exit 1
|
||||
hdiutil detach mnt || exit 1
|
||||
hdiutil convert temp.dmg -format UDZO -o $B_DMG || exit 1
|
||||
hdiutil convert temp.dmg -format UDZO -o "$B_DMG" || exit 1
|
||||
rm temp.dmg
|
||||
|
||||
echo "dmg $B_DMB created successfully"
|
||||
echo "dmg $B_DMG created successfully"
|
||||
|
|
|
|||
|
|
@ -5,28 +5,28 @@ B_TARGET=$1
|
|||
if [ "x$B_TARGET" = "x" ]; then
|
||||
|
||||
# add warning for users running manually
|
||||
function warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
|
||||
warn() { tput bold; tput setaf 3; echo "$@"; tput sgr0 ; }
|
||||
warn "The scripts build_installer.sh and reref_dylibs.sh have been deprecated."
|
||||
warn "Please use build_dist.sh instead to deploy using macdeployqt"
|
||||
|
||||
echo Which binary needs to be re-referenced?
|
||||
echo "Which binary needs to be re-referenced?"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd $(dirname $B_TARGET) || exit 1
|
||||
cd "$(dirname "$B_TARGET")" || exit 1
|
||||
|
||||
# where to find non-system libraries relative to target's directory.
|
||||
# the vast majority of the time this should be empty
|
||||
B_REL_PATH=$2
|
||||
|
||||
# we're in target's directory now. trim off the path
|
||||
B_TARGET=$(basename $B_TARGET)
|
||||
B_TARGET=$(basename "$B_TARGET")
|
||||
|
||||
# get a list of non-system libraries and make local copies
|
||||
B_LIBS=$(otool -XL $B_TARGET | awk '{ print $1 }' | grep -Ev '^(/usr/lib|/System)')
|
||||
B_LIBS=$(otool -XL "$B_TARGET" | awk '{ print $1 }' | grep -Ev '^(/usr/lib|/System)')
|
||||
[ $? -ne 0 ] && exit 1
|
||||
for B_LIB in $B_LIBS; do
|
||||
B_LIB_NAME=$(basename $B_LIB)
|
||||
B_LIB_NAME=$(basename "$B_LIB")
|
||||
# otool reports barrier as "barrier:" which fails self-reference test below
|
||||
B_LIB_NAME=${B_LIB_NAME//:}
|
||||
|
||||
|
|
@ -34,16 +34,16 @@ for B_LIB in $B_LIBS; do
|
|||
[ "$B_TARGET" = "$B_LIB_NAME" ] && continue
|
||||
|
||||
B_DST=${B_REL_PATH}${B_LIB_NAME}
|
||||
if [ ! -e $B_DST ]; then
|
||||
cp $B_LIB $B_DST || exit 1
|
||||
chmod u+rw $B_DST || exit 1
|
||||
if [ ! -e "$B_DST" ]; then
|
||||
cp "$B_LIB" "$B_DST" || exit 1
|
||||
chmod u+rw "$B_DST" || exit 1
|
||||
# recursively call this script on libraries purposefully not passing
|
||||
# $B_REL_PATH so that it is only used explicitly
|
||||
$0 $B_DST
|
||||
$0 "$B_DST"
|
||||
fi
|
||||
|
||||
# adjust the target's metadata to point to the local copy
|
||||
# rather than the system-wide copy which would only exist on
|
||||
# a development machine
|
||||
install_name_tool -change $B_LIB @loader_path/$B_DST $B_TARGET || exit 1
|
||||
install_name_tool -change "$B_LIB" "@loader_path/$B_DST" "$B_TARGET" || exit 1
|
||||
done
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ section: links
|
|||
end
|
||||
|
||||
# The aliases section is to map the full names of the computers to their logical names used in the screens section
|
||||
# One way to find the actual name of a comptuer is to run hostname from a command window
|
||||
# One way to find the actual name of a computer is to run hostname from a command window
|
||||
section: aliases
|
||||
# Laptop is actually known as John-Smiths-MacBook-3.local
|
||||
John-Smiths-MacBook-3.local:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Checks if directory exists, otherwise asks to install package.
|
||||
function check_dir_exists() {
|
||||
check_dir_exists() {
|
||||
local path=$1
|
||||
local package=$2
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ function check_dir_exists() {
|
|||
fi
|
||||
}
|
||||
|
||||
if [ ! $BARRIER_BUILD_ENV ]; then
|
||||
if [ -z "$BARRIER_BUILD_ENV" ]; then
|
||||
check_dir_exists '/Applications/Xcode.app' 'Xcode'
|
||||
|
||||
printf "Modifying environment for Barrier build...\n"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Thank you for chosing Barrier!
|
||||
Thank you for choosing Barrier!
|
||||
https://github.com/debauchee/barrier/
|
||||
|
||||
Barrier allows you to share your keyboard and mouse between computers over a network.
|
||||
|
|
|
|||
|
|
@ -5,6 +5,5 @@ Comment=Keyboard and mouse sharing solution
|
|||
Exec=barrier
|
||||
Icon=barrier
|
||||
Terminal=false
|
||||
Categories=Utility;DesktopUtility;
|
||||
Categories=Utility;RemoteAccess;
|
||||
Keywords=keyboard;mouse;sharing;network;share;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#!/bin/sh
|
||||
ICNS_BASE=../dist/macos/bundle/Barrier.app/Contents/Resources
|
||||
if ! which magick >/dev/null 2>&1; then
|
||||
echo "Need ImageMagic for this"
|
||||
echo "Need ImageMagick for this"
|
||||
exit 10
|
||||
fi
|
||||
cd $(dirname $0) || exit $?
|
||||
cd "$(dirname "$0")" || exit $?
|
||||
if [ ! -r barrier.png ]; then
|
||||
echo "Use inkscape (or another vector graphics editor) to create barrier.png from barrier.svg first"
|
||||
exit 10
|
||||
|
|
@ -12,11 +12,11 @@ fi
|
|||
rm -rf work || exit $?
|
||||
mkdir -p work || exit $?
|
||||
for s in 16 24 32 48 64 128 256 512 1024; do
|
||||
magick convert barrier.png -resize ${s}x${s} -depth 8 work/${s}.png || exit $?
|
||||
magick convert barrier.png -resize "${s}x${s}" -depth 8 "work/${s}.png" || exit $?
|
||||
done
|
||||
# windows icon
|
||||
magick convert work/{16,24,32,48,64,128}.png barrier.png barrier.ico || exit $?
|
||||
# macos icon
|
||||
png2icns $ICNS_BASE/Barrier.icns work/{16,32,256,512,1024}.png || exit $?
|
||||
png2icns "$ICNS_BASE/Barrier.icns" work/{16,32,256,512,1024}.png || exit $?
|
||||
rm -rf work
|
||||
echo Done
|
||||
|
|
|
|||
|
|
@ -20,4 +20,3 @@ add_subdirectory(barriers)
|
|||
if (WIN32)
|
||||
add_subdirectory(barrierd)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -46,4 +46,3 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
install (TARGETS barrierc DESTINATION bin)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -66,4 +66,3 @@ createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events
|
|||
{
|
||||
return new OSXClientTaskBarReceiver(logBuffer, events);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ BEGIN
|
|||
VALUE "ProductName", "Barrier"
|
||||
VALUE "ProductVersion", BARRIER_VERSION
|
||||
VALUE "OriginalFilename", "barrierd.exe"
|
||||
VALUE "FileDescription", "Open source KVM software deamon"
|
||||
VALUE "FileDescription", "Open source KVM software daemon"
|
||||
VALUE "InternalName", "barrierd"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -46,5 +46,3 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
install (TARGETS barriers DESTINATION bin)
|
||||
endif()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -40,4 +40,3 @@ class AboutDialog : public QDialog, public Ui::AboutDialogBase
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -164,4 +164,3 @@ QTextStream& operator<<(QTextStream& outStream, const Action& action)
|
|||
|
||||
return outStream;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,4 +44,3 @@ const char* BaseConfig::m_SwitchCornerNames[] =
|
|||
"bottom-left",
|
||||
"bottom-right"
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -54,4 +54,3 @@ class KeySequence
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -78,4 +78,3 @@ class KeySequenceWidget : public QPushButton
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -624,7 +624,7 @@ QString MainWindow::configFilename()
|
|||
if (m_pRadioInternalConfig->isChecked())
|
||||
{
|
||||
// TODO: no need to use a temporary file, since we need it to
|
||||
// be permenant (since it'll be used for Windows services, etc).
|
||||
// be permanent (since it'll be used for Windows services, etc).
|
||||
m_pTempConfigFile = new QTemporaryFile();
|
||||
if (!m_pTempConfigFile->open())
|
||||
{
|
||||
|
|
@ -729,7 +729,7 @@ void MainWindow::stopBarrier()
|
|||
|
||||
void MainWindow::stopService()
|
||||
{
|
||||
// send empty command to stop service from laucning anything.
|
||||
// send empty command to stop service from launching anything.
|
||||
m_IpcClient.sendCommand("", appConfig().elevateMode());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -211,4 +211,3 @@ private slots:
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*
|
||||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2008 Volker Lanz (vl@fidra.de)
|
||||
|
|
@ -45,4 +45,3 @@ void NewScreenWidget::mousePressEvent(QMouseEvent* event)
|
|||
|
||||
pDrag->exec(Qt::CopyAction, Qt::CopyAction);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,4 +37,3 @@ class NewScreenWidget : public QLabel
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -44,4 +44,3 @@ class QBarrierApplication : public QApplication
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -105,4 +105,3 @@ QDataStream& operator<<(QDataStream& outStream, const Screen& screen);
|
|||
QDataStream& operator>>(QDataStream& inStream, Screen& screen);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -152,4 +152,3 @@ void ScreenSettingsDialog::on_m_pListAliases_itemSelectionChanged()
|
|||
{
|
||||
m_pButtonRemoveAlias->setEnabled(!m_pListAliases->selectedItems().isEmpty());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -50,4 +50,3 @@ class ScreenSettingsDialog : public QDialog, public Ui::ScreenSettingsDialogBase
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -141,4 +141,3 @@ bool ScreenSetupModel::dropMimeData(const QMimeData* data, Qt::DropAction action
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -68,4 +68,3 @@ class ScreenSetupModel : public QAbstractTableModel
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -225,4 +225,3 @@ QStyleOptionViewItem ScreenSetupView::viewOptions() const
|
|||
option.textElideMode = Qt::ElideMiddle;
|
||||
return option;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,4 +58,3 @@ class ScreenSetupView : public QTableView
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -138,4 +138,3 @@ enum {
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ void ServerConfigDialog::showEvent(QShowEvent* event)
|
|||
|
||||
if (!m_Message.isEmpty())
|
||||
{
|
||||
// TODO: ideally this massage box should pop up after the dialog is shown
|
||||
// TODO: ideally this message box should pop up after the dialog is shown
|
||||
QMessageBox::information(this, tr("Configure server"), m_Message);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,4 +63,3 @@ class ServerConfigDialog : public QDialog, public Ui::ServerConfigDialogBase
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
|
|||
|
||||
#elif defined(Q_OS_WIN)
|
||||
|
||||
// when areo is disabled on windows, the next/back buttons
|
||||
// when aero is disabled on windows, the next/back buttons
|
||||
// are hidden (must be a qt bug) -- resizing the window
|
||||
// to +1 of the original height seems to fix this.
|
||||
// NOTE: calling setMinimumSize after this will break
|
||||
|
|
|
|||
|
|
@ -19,4 +19,3 @@
|
|||
|
||||
// included in both the GUI and the child apps (server & client)
|
||||
const char ShutdownCh = 'S';
|
||||
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ void SslCertificate::generateCertificate()
|
|||
arguments.append("-x509");
|
||||
arguments.append("-nodes");
|
||||
|
||||
// valide duration
|
||||
// valid duration
|
||||
arguments.append("-days");
|
||||
arguments.append(kCertificateLifetime);
|
||||
|
||||
|
|
|
|||
|
|
@ -40,4 +40,3 @@ void TrashScreenWidget::dropEvent(QDropEvent* event)
|
|||
else
|
||||
event->ignore();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,4 +39,3 @@ class TrashScreenWidget : public QLabel
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ std::string ArchInternetWindows::urlEncode(const std::string& url)
|
|||
|
||||
std::string result(buffer);
|
||||
|
||||
// the win32 url encoding funcitons are pretty useless (to us) and only
|
||||
// the win32 url encoding functions are pretty useless (to us) and only
|
||||
// escape "unsafe" chars, but not + or =, so we need to replace these
|
||||
// manually (and probably many other chars).
|
||||
barrier::string::findReplaceAll(result, "+", "%2B");
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ XArchEvalWinsock::eval() const noexcept
|
|||
/* 10052 */{WSAENETRESET, "The connection must be reset because the Windows Sockets implementation dropped it"},
|
||||
/* 10053 */{WSAECONNABORTED, "The virtual circuit was aborted due to timeout or other failure"},
|
||||
/* 10054 */{WSAECONNRESET, "The virtual circuit was reset by the remote side"},
|
||||
/* 10055 */{WSAENOBUFS, "No buffer space is available or a buffer deadlock has occured. The socket cannot be created"},
|
||||
/* 10055 */{WSAENOBUFS, "No buffer space is available or a buffer deadlock has occurred. The socket cannot be created"},
|
||||
/* 10056 */{WSAEISCONN, "The socket is already connected"},
|
||||
/* 10057 */{WSAENOTCONN, "The socket is not connected"},
|
||||
/* 10058 */{WSAESHUTDOWN, "The socket has been shutdown"},
|
||||
|
|
@ -100,7 +100,7 @@ XArchEvalWinsock::eval() const noexcept
|
|||
/* 10069 */{WSAEDQUOT, "Undocumented WinSock error code"},
|
||||
/* 10070 */{WSAESTALE, "Undocumented WinSock error code"},
|
||||
/* 10071 */{WSAEREMOTE, "Undocumented WinSock error code"},
|
||||
/* 10091 */{WSASYSNOTREADY, "Underlying network subsytem is not ready for network communication"},
|
||||
/* 10091 */{WSASYSNOTREADY, "Underlying network subsystem is not ready for network communication"},
|
||||
/* 10092 */{WSAVERNOTSUPPORTED, "The version of WinSock API support requested is not provided in this implementation"},
|
||||
/* 10093 */{WSANOTINITIALISED, "WinSock subsystem not properly initialized"},
|
||||
/* 10101 */{WSAEDISCON, "Virtual circuit has gracefully terminated connection"},
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public:
|
|||
|
||||
//! Deactivate screen saver
|
||||
/*!
|
||||
Deactivate (i.e. hide) the screen saver, reseting the screen saver
|
||||
Deactivate (i.e. hide) the screen saver, resetting the screen saver
|
||||
timer.
|
||||
*/
|
||||
virtual void deactivate() = 0;
|
||||
|
|
|
|||
|
|
@ -267,8 +267,8 @@ extern const char* kMsgDSetOptions;
|
|||
// 2 means the file transfer is finished.
|
||||
extern const char* kMsgDFileTransfer;
|
||||
|
||||
// drag infomation: primary <-> secondary
|
||||
// transfer drag infomation. The first 2 bytes are used for storing
|
||||
// drag information: primary <-> secondary
|
||||
// transfer drag information. The first 2 bytes are used for storing
|
||||
// the number of dragging objects. Then the following string consists
|
||||
// of each object's directory.
|
||||
extern const char* kMsgDDragInfo;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ Log::Log()
|
|||
{
|
||||
assert(s_log == NULL);
|
||||
|
||||
// other initalization
|
||||
// other initialization
|
||||
m_maxPriority = g_defaultMaxPriority;
|
||||
m_maxNewlineLength = 0;
|
||||
insert(new ConsoleLogOutputter);
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ public:
|
|||
*/
|
||||
NetworkAddress getServerAddress() const;
|
||||
|
||||
//! Return true if recieved file size is valid
|
||||
//! Return true if received file size is valid
|
||||
bool isReceivedFileSizeValid();
|
||||
|
||||
//! Return expected file size
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ const std::string& DataDirectories::global(const std::string& path)
|
|||
const std::string& DataDirectories::systemconfig()
|
||||
{
|
||||
// systemconfig() is a special case in that it will track the current value
|
||||
// of global() unless and until it is explictly set otherwise
|
||||
// of global() unless and until it is explicitly set otherwise
|
||||
// previously it would default to the windows folder which was horrible!
|
||||
if (_systemconfig.empty())
|
||||
return global();
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class IJob;
|
|||
//! Thread handle
|
||||
/*!
|
||||
Creating a Thread creates a new context of execution (i.e. thread) that
|
||||
runs simulatenously with the calling thread. A Thread is only a handle
|
||||
runs simultaneously with the calling thread. A Thread is only a handle
|
||||
to a thread; deleting a Thread does not cancel or destroy the thread it
|
||||
refers to and multiple Thread objects can refer to the same thread.
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ public:
|
|||
/*!
|
||||
Change the priority of the thread. Normal priority is 0, 1 is
|
||||
the next lower, etc. -1 is the next higher, etc. but boosting
|
||||
the priority may not be permitted and will be silenty ignored.
|
||||
the priority may not be permitted and will be silently ignored.
|
||||
*/
|
||||
void setPriority(int n);
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public:
|
|||
If \c hostname can be parsed as a numerical address then that's how
|
||||
it's used, otherwise it's used as a host name. If \c hostname ends
|
||||
in ":[0-9]+" then that suffix is extracted and used as the port,
|
||||
overridding the port parameter. The resulting port must be a valid
|
||||
overriding the port parameter. The resulting port must be a valid
|
||||
port number (zero is not a valid port number) otherwise \c XSocketAddress
|
||||
is thrown with an error of \c XSocketAddress::kBadPort. The hostname
|
||||
is not resolved by the c'tor; use \c resolve to do that.
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ SecureSocket::disconnect()
|
|||
void SecureSocket::formatFingerprint(std::string& fingerprint, bool hex, bool separator)
|
||||
{
|
||||
if (hex) {
|
||||
// to hexidecimal
|
||||
// to hexadecimal
|
||||
barrier::string::toHex(fingerprint, 2);
|
||||
}
|
||||
|
||||
|
|
@ -666,7 +666,7 @@ void SecureSocket::formatFingerprint(std::string& fingerprint, bool hex, bool se
|
|||
barrier::string::uppercase(fingerprint);
|
||||
|
||||
if (separator) {
|
||||
// add colon to separate each 2 charactors
|
||||
// add colon to separate each 2 characters
|
||||
size_t separators = fingerprint.size() / 2;
|
||||
for (size_t i = 1; i < separators; i++) {
|
||||
fingerprint.insert(i * 3 - 1, ":");
|
||||
|
|
@ -830,7 +830,7 @@ SecureSocket::showSecureCipherInfo()
|
|||
}
|
||||
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
// m_ssl->m_ssl->session->ciphers is not forward compatable,
|
||||
// m_ssl->m_ssl->session->ciphers is not forward compatible,
|
||||
// In future release of OpenSSL, it's not visible,
|
||||
STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -803,7 +803,7 @@ MSWindowsDesks::checkDesk()
|
|||
|
||||
// if active desktop changed then tell the old and new desk threads
|
||||
// about the change. don't switch desktops when the screensaver is
|
||||
// active becaue we'd most likely switch to the screensaver desktop
|
||||
// active because we'd most likely switch to the screensaver desktop
|
||||
// which would have the side effect of forcing the screensaver to
|
||||
// stop.
|
||||
if (name != m_activeDeskName && !m_screensaver->isActive()) {
|
||||
|
|
|
|||
|
|
@ -1330,7 +1330,7 @@ MSWindowsKeyState::getKeyID(UINT virtualKey, KeyButton button) const
|
|||
if ((LOWORD(m_keyLayout) & 0xffffu) == 0x0412u) { // 0x0412 : Korean Locale ID
|
||||
if (virtualKey == VK_HANGUL || virtualKey == VK_HANJA) {
|
||||
// If shift-space is used to change the input mode,
|
||||
// the extented bit is not set. So add it to get right key id.
|
||||
// the extended bit is not set. So add it to get right key id.
|
||||
button |= 0x100u;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ private:
|
|||
|
||||
//! Relauncher error
|
||||
/*!
|
||||
An error occured in the process watchdog.
|
||||
An error occurred in the process watchdog.
|
||||
*/
|
||||
class XMSWindowsWatchdogError : public XBarrier {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ OSXClipboard::OSXClipboard() :
|
|||
|
||||
OSStatus syncErr = PasteboardSynchronize(m_pboard);
|
||||
if (syncErr != noErr) {
|
||||
LOG((CLOG_DEBUG "failed to syncronize clipboard: error %i", syncErr));
|
||||
LOG((CLOG_DEBUG "failed to synchronize clipboard: error %i", syncErr));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ fakeDragging(const char* str, int cursorX, int cursorY)
|
|||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
NSRect screen = [[NSScreen mainScreen] frame];
|
||||
NSLog ( @"screen size: witdh = %f height = %f", screen.size.width, screen.size.height);
|
||||
NSLog ( @"screen size: width = %f height = %f", screen.size.width, screen.size.height);
|
||||
NSLog ( @"mouseLocation: %d %d", cursorX, cursorY);
|
||||
|
||||
int newPosX = 0;
|
||||
|
|
|
|||
|
|
@ -538,7 +538,7 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
|
|||
|
||||
// As long as the click is within the time window and distance window
|
||||
// increase clickState (double click, triple click, etc)
|
||||
// This will allow for higher than triple click but the quartz documenation
|
||||
// This will allow for higher than triple click but the quartz documentation
|
||||
// does not specify that this should be limited to triple click
|
||||
if (press) {
|
||||
if ((ARCH->time() - m_lastClickTime) <= clickTime && diff <= maxDiff) {
|
||||
|
|
@ -1618,7 +1618,7 @@ OSXScreen::userSwitchCallback(EventHandlerCallRef nextHandler,
|
|||
//
|
||||
// OSXScreen::watchSystemPowerThread(void*)
|
||||
//
|
||||
// main of thread monitoring system power (sleep/wakup) using a CFRunLoop
|
||||
// main of thread monitoring system power (sleep/wakeup) using a CFRunLoop
|
||||
//
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ private:
|
|||
// the X display
|
||||
Display* m_display;
|
||||
|
||||
// window to receive xscreensaver repsonses
|
||||
// window to receive xscreensaver responses
|
||||
Window m_xscreensaverSink;
|
||||
|
||||
// the target for the events we generate
|
||||
|
|
|
|||
|
|
@ -1136,9 +1136,9 @@ Server::processOptions()
|
|||
return;
|
||||
}
|
||||
|
||||
m_switchNeedsShift = false; // it seems if i don't add these
|
||||
m_switchNeedsShift = false; // it seems if I don't add these
|
||||
m_switchNeedsControl = false; // lines, the 'reload config' option
|
||||
m_switchNeedsAlt = false; // doesnt' work correct.
|
||||
m_switchNeedsAlt = false; // doesn't work correct.
|
||||
|
||||
bool newRelativeMoves = m_relativeMoves;
|
||||
for (Config::ScreenOptions::const_iterator index = options->begin();
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ public:
|
|||
*/
|
||||
void getClients(std::vector<std::string>& list) const;
|
||||
|
||||
//! Return true if recieved file size is valid
|
||||
//! Return true if received file size is valid
|
||||
bool isReceivedFileSizeValid();
|
||||
|
||||
//! Return expected file data size
|
||||
|
|
@ -357,7 +357,7 @@ private:
|
|||
// force the cursor off of \p client
|
||||
void forceLeaveClient(BaseClientProxy* client);
|
||||
|
||||
// thread funciton for sending file
|
||||
// thread function for sending file
|
||||
void sendFileThread(void*);
|
||||
|
||||
// thread function for writing file to drop directory
|
||||
|
|
|
|||
Loading…
Reference in New Issue